预约活动模块、代客下单优惠券使用及其他问题修改

src/components/basic-component/u-tabs-swiper/u-tabs-swiper.vue

@@ -25,6 +25,8 @@
                         @tap="emit(index)"
                 >
                     {{ item[name] || item['name']}}
+					
+					<view class="line" v-if="line && getTabs.length>1 && index!=getTabs.length-1"></view>
                 </view>
                 <view
                         class="u-scroll-bar"
@@ -135,7 +137,11 @@
             bold: {
                 type: Boolean,
                 default: true
-            }
+            },
+			line:{
+				type:Boolean,
+				default:false
+			}
         },
         data() {
             return {
@@ -379,6 +385,16 @@
         text-align: center;
         transition-property: background-color, color, font-weight;
     }
+	
+	.line{
+		position: absolute;
+		right: 0;
+		top: 50%;
+		transform: translateY(-50%);
+		height: 40%;
+		width: 1px;
+		background-color: #aaa;
+	}
 
     .content {
         overflow: hidden;

src/components/page-component/app-user-center-top/app-user-center-top.vue

@@ -701,7 +701,7 @@
 		.u-icon {
 			width: 21upx;
 			height: 21upx;
-			background-image: url('../../../static/image/index/refresh.png');
+			background-image: url('https://t17.9026.com/web/statics/image/index/refresh.png');
 			background-size: 100% 100%;
 			background-repeat: no-repeat;
 			margin-right: 5upx;

src/components/page-component/goods/app-goods-banner.vue

@@ -233,11 +233,11 @@
     }
 
     .swiper {
-        height: #{1000rpx};
+        height: #{750rpx};
 
         .swiper-img {
             width: 100%;
-            height: #{1000rpx};
+            height: #{750rpx};
             background-size: cover;
             background-repeat: no-repeat;
             background-position: center;

src/pages.json

@@ -95,14 +95,14 @@
 			}, {
 				"path": "appointment/appointment",
 				"style": {
-					"navigationBarTitleText": "预约",
+					"navigationBarTitleText": "预约详情",
 					"enablePullDownRefresh": false
 				}
 
 			}, {
 				"path": "appointment/appointment-form",
 				"style": {
-					"navigationBarTitleText": "预约",
+					"navigationBarTitleText": "预约表单",
 					"enablePullDownRefresh": false,
 					"navigationStyle": "custom"
 				}
@@ -124,7 +124,7 @@
 			}, {
 				"path": "appointment/appointment-list",
 				"style": {
-					"navigationBarTitleText": "预约列表",
+					"navigationBarTitleText": "",
 					"enablePullDownRefresh": false,
 					"navigationBarBackgroundColor": "#ffffff"
 				}

src/pages/case/appointment/appointment-form.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<!-- <image src="../../../static/image/index/appointment_top.png" mode=""></image> -->
+		<!-- <image src="https://t17.9026.com/web/statics/image/index/appointment_top.png" mode=""></image> -->
 		<app-nav-bar v-if="true" :fixed="true" :xStyle="1" :hasMallSetting="2" :title="'预约'" color="#fff" :background-color="'#e2c47b'"></app-nav-bar>
 		<!-- <app-nav-bar v-if="true" :fixed="true" :background-color="''" :xStyle="1" :hasMallSetting="2" -->
 		<view class="main-between-y builInfo">

src/pages/case/appointment/appointment-list.vue

@@ -1,4 +1,5 @@
 <template>
+	<app-layout>
 	<view class="page">
 		<view class="center">
 			<view class="item" v-for="(item,index) in VisitList" :key="index" @click="goPage(item.id)">
@@ -20,30 +21,45 @@
 					<view class="t-omit">活动地点：{{item.address}}</view>
 				</view>
 			</view>
-			<view class="no-more">没有更多了...</view>
+			<appNoData v-if="VisitList.length===0" :title="'暂无预约'"></appNoData>
+			<view class="no-more" v-if="noMore">没有更多了...</view>
 		</view>
 	</view>
+	</app-layout>
 </template>
 
 <script>
+	import appNoData from '@/components/page-component/app-no-goods/app-no-goods.vue'
 	export default {
+		components:{
+			appNoData
+		},
 		data() {
 			return {
 				page:1,
 				is_myself:0,
 				VisitList:[],
+				noMore:false
 			};
 		},
 		onLoad(option) {
+			'is_myself' in option?this.is_myself=option.is_myself:''
+			this.getVisitList()
+		},
+		onReachBottom() {
+			if(!this.noMore){
+			this.page++
 			this.getVisitList()
+			}
 		},
 		methods:{
 			goPage(id){
 				uni.navigateTo({
-					url:'/pages/case/appointment/appointment?id='+id
+					url:`/pages/case/appointment/appointment?id=${id}&is_myself=${this.is_myself}`
 				})
 			},
 			getVisitList(){
+				this.$showLoading()
 				this.$request({
 					url:this.$api.user.visit_list,
 					methods:'post',
@@ -53,8 +69,16 @@
 					}
 				}).then(res=>{
 					if(res.code===0){
-						this.VisitList=res.data.list
+						if(this.page==1){
+							this.VisitList=res.data.list
+						}else{
+							this.VisitList=this.VisitList.concat(res.data.list) 
+						}
+						if(res.data.list.length<20){
+							this.noMore=true
+						}
 					}
+					this.$hideLoading()
 				})
 			}
 		}

src/pages/case/appointment/appointment.vue

@@ -109,7 +109,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="noMake cross-center"><button type="default" @tap="goAppointment">立即预约</button></view>
+		<view class="noMake cross-center" v-if="!is_myself"><button type="default" @tap="goAppointment">立即预约</button></view>
 	</view>
 </template>
 
@@ -122,10 +122,13 @@ export default {
 	data() {
 		return {
 			swiperKey: 0,
-			dataDetail:{}
+			dataDetail:{},
+			
+			is_myself:0
 		};
 	},
 	onLoad(option) {
+		this.is_myself=option.is_myself
 		this.$request({
 			url: this.$api.user.visit_detail,
 			data: {

src/pages/case/components/hxj-bd-info.vue

@@ -4,7 +4,7 @@
 			<view class="main-between-y">
 				<view class="main-left cross-center">
 					<view class="hxj-name t-omit">{{name}}</view>
-					<view class="hxj-tags">{{tag}}</view>
+					<view class="hxj-tags t-omit">{{tag}}</view>
 					<view class="hxj-ynum">已售{{sales}}+</view>
 				</view>
 				<view class="main-left cross-center hjx-tc-999 hjx-ts-22">
@@ -16,7 +16,7 @@
 			</view>
 			<view class="main-between-y">
 				<view>
-					<view v-if="coupons.length>0" class="main-center cross-center lq" @click="receive">领券<image src="../../../static/image/index/arrow-right-facet-white.png" mode=""></image></view>
+					<view v-if="coupons.length>0" class="main-center cross-center lq" @click="receive">领券<image src="https://t17.9026.com/web/statics/image/index/arrow-right-facet-white.png" mode=""></image></view>
 				</view>
 				<view class="cross-center se" v-if="isShowShare" @click="shareClick">
 					<image src="https://t17.9026.com/web/statics/image/index/share_y.png" mode=""></image>分享
@@ -162,7 +162,7 @@
 		}
 
 		.hxj-tags {
-			max-width: 56rpx;
+			max-width: 110rpx;
 			height: 30rpx;
 			background: #040404;
 			font-size: 20rpx;
@@ -170,6 +170,7 @@
 			color: #FFFFFF;
 			margin-right: 13rpx;
 			text-align: center;
+			padding: 0 10rpx;
 		}
 
 		.hxj-ynum {

src/pages/case/hot_sale_project.vue

@@ -37,15 +37,18 @@
 					</view>
 				</view>
 			</view>
+			<appNoData v-if="CompositionList.length==0" :title="'该分类暂无套餐'"></appNoData>
 		</view>
 	</view>
 </template>
 
 <script>
 	import appNavBar from '@/components/page-component/index/app-nav-bar.vue';
+	import appNoData from '@/components/page-component/app-no-goods/app-no-goods.vue';
 	export default {
 		components:{
-			appNavBar
+			appNavBar,
+			appNoData
 		},
 		data() {
 			return {
@@ -92,7 +95,7 @@
 			getCompositionList(cat_id=''){
 				this.$request({
 					url:this.$api.composition.list,
-					methods:'post',
+					method:'post',
 					data:{
 						cat_id:cat_id
 					}

src/pages/comments/app-comments.vue

@@ -5,7 +5,7 @@
                 <view class="box box-grow-1 main-center cross-center" @click="clickStatus(item.index)"
                       v-for="(item, index) in commentCount"
                       :key="index"
-                      :style="{'background-color': status === item.index ? theme.background : ''}"
+                      :style="{'background-color': status === item.index ? getTheme.background : ''}"
                       :class="status === item.index ? 'u-text ' : 'background'">
                     {{item.name}}({{item.count}})
                 </view>

src/pages/coupon/index/index.vue

@@ -10,8 +10,8 @@
 	                <image class="status" src="https://shop.9026.com/web/statics/img/mall/coupon/img-coupon-status-icon-1.png" v-if="activeTab == 2"></image>
 	                <image class="status" src="https://shop.9026.com/web/statics/img/mall/coupon/img-coupon-status-icon-2.png" v-if="activeTab == 3"></image> -->
 					
-					<image src="../../../static/image/index/img-coupon-bg-0.png" v-if="activeTab == 1"></image>
-					<image src="https://shop.9026.com/web/statics/img/mall/coupon/img-coupon-bg-1.png" v-else></image>
+					<image src="https://t17.9026.com/web/statics/image/index/img-coupon-bg-0.png" v-if="activeTab == 1"></image>
+					<image src="https://t17.9026.com/web/statics/image/index/img-coupon-bg-0.png" v-else></image>
 					<image class="status" src="https://shop.9026.com/web/statics/img/mall/coupon/img-coupon-status-icon-1.png" v-if="activeTab == 2"></image>
 					<image class="status" src="https://shop.9026.com/web/statics/img/mall/coupon/img-coupon-status-icon-2.png" v-if="activeTab == 3"></image>
 	                <view class="item-left dir-top-nowrap main-center">
@@ -221,6 +221,7 @@
 	.coupon-price {
 	    font-size: #{36rpx};
 	    padding-bottom: #{16rpx};
+		font-weight: 600;
 	}
 
 	.item-right {

src/pages/favorite/favorite.vue

@@ -347,13 +347,11 @@ export default {
 				this.statusTop = 85;
 				setTimeout(() => {
 					this.getCurrent = index;
-					this.getFavorite();
 				});
-				
+				this.getFavorite();
 			} else if (index === 1) {
 				setTimeout(() => {
 					this.is_goods = false;
-					this.getTopicList();
 				}, 500);
 				this.getCurrent = index;
 				this.left = 375;
@@ -370,7 +368,7 @@ export default {
 					this.touch = false;
 					this.allTouch = false;
 				}
-				
+				this.getTopicList();
 			}
 		},
 

src/pages/goods/goods.vue

@@ -1,7 +1,7 @@
 <template>
     <app-layout>
         <view v-if="!goods" class="u-goods-detail"></view>
-        <template v-if="goods">
+        <view v-if="goods" style="background-color: #fff;">
 			
 			<app-nav-bar  :fixed="true" :background-color="''" :xStyle="1" :hasMallSetting="2"
 				:hasHeight="false"></app-nav-bar>
@@ -94,9 +94,16 @@
                 </view>
 				</navigator>
             </view>
-            <bd-comments :goods-id="goodsId"></bd-comments>
+			<view class="hxj-line"></view>			
+			<uTabsSwiper :list="[{tab:'商品评价'},{tab:'商品详情'}]" :current="tabsCurrent" name="tab" :activeColor="getTheme.color" :barHeight="0" :isScroll="false" @change="tabsChange" line></uTabsSwiper>
+			<!-- 评价 -->
+			<view v-show="tabsCurrent===0">
+				<bd-comments :goods-id="goodsId" ></bd-comments>
+			</view>
             <!--商品详情-->
-            <bd-detail :detail="detail"></bd-detail>
+			<view v-show="tabsCurrent===1">
+				<bd-detail :detail="detail" ></bd-detail>
+			</view>
             <!--相关推荐-->
             <app-goods-recommend :sureCart="true" :theme="getTheme" :goods-list="recommend_list"></app-goods-recommend>
             <!--空格区域-->
@@ -206,7 +213,7 @@
                 @check="check"
                 @update="updateCartNumber"
             ></u-attr>
-        </template>
+        </view>
         <app-close v-if="showClose" :modal="false" @update="getMall"></app-close>
     </app-layout>
 </template>
@@ -234,7 +241,7 @@
 	import goodsMixin from '@/core/goods-mixin.js';
 	
 	import appNavBar from '@/components/page-component/index/app-nav-bar.vue';
-
+	import uTabsSwiper from '@/components/basic-component/u-tabs-swiper/u-tabs-swiper.vue';
     export default {
         name: "goods",
 		mixins: [goodsMixin],
@@ -257,10 +264,12 @@
             bdService,
             bdFlashSale,
 			appSellTip,
-			appNavBar
+			appNavBar,
+			uTabsSwiper,
         },
         data() {
             return {
+				tabsCurrent:1,
                 showClose: false,
                 is_open: 0,
                 goods: null,
@@ -521,6 +530,9 @@
                     this.current = e.detail.current;
                 }
             },
+			tabsChange(e){
+				this.tabsCurrent=e
+			},
             quickShare(info) {
                 this.shareData = info;
                 //#ifdef H5

src/pages/index/hxj_index_component.vue

@@ -26,14 +26,14 @@
 			<view class="subtitle">臻选整装 · 安全无甲醛 · 7天入住</view>
 		</view>
 		<view class="lg_list">
-			<view class="item" v-for="(item,index) in homePages[5].data.list" :key="index"
+			<view class="item" v-for="(item,index) in compositionList" :key="index"
 				@click="goPage(item.type=='goods'?`/pages/goods/goods?id=${item.id}`:`/pages/case/projectInfo?id=${item.id}`)">
-				<image class="imgBox" :src="item.cover_pic">
+				<image class="imgBox" :src="item.cover_img">
 				</image>
 				<view class="b_card main-between">
 					<view class="left">
 						<view class="title t-omit" style="width: 420rpx;">{{item.name}}</view>
-						<view class="desc t-omit" style="width: 420rpx;">{{item.subtitle}}</view>
+						<view class="desc t-omit" style="width: 420rpx;">{{item.tag}}</view>
 					</view>
 					<view class="right">
 						<view class="price"><text class="rmb">￥</text><text>{{item.price}}</text><text
@@ -55,7 +55,7 @@
 
 		</view>
 		<view class="coupon main-left">
-			<view class="item main-left" v-for="(item,index) in homePages[6].data.coupon_list" :key="index" @click="goPage(`/pages/coupon/list/list`)">
+			<view class="item main-left" v-for="(item,index) in homePages[6].data.coupon_list" :key="index" @click="receive(index)">
 				<view class="Wb">
 					<view>
 						<view class="title_2">定制优享礼券 <text class="hjx-tc-B19D60 hjx-ts-21 hxj-ml-10">立即领取</text></view>
@@ -76,31 +76,31 @@
 		</view>
 		<view class="hxdz">
 			<view class="main-left q">
-				<view class="l">
+				<view class="l" @click="goPage(homePages[7].data.list[0].link.new_link_url)">
 					<view class="title_2">明星套装</view>
 					<view class="desc_2">自然高端好家居</view>
-					<image src="https://t17.9026.com/web/statics/image/index/4.png" mode=""></image>
+					<image :src="homePages[7].data.list[0].pic_url" mode=""></image>
 				</view>
 				<view class="main-between-y">
-					<view class="r1" @click="goPage('/pages/case/selectedCases')">
+					<view class="r1" @click="goPage(homePages[7].data.list[1].link.new_link_url)">
 						<view class="title_2">优选</view>
 						<view class="desc_2">优选家居</view>
-						<image src="https://t17.9026.com/web/statics/image/index/5.png" mode=""></image>
+						<image :src="homePages[7].data.list[1].pic_url" mode=""></image>
 					</view>
-					<view class="r2">
+					<view class="r2" @click="goPage(homePages[7].data.list[2].link.new_link_url)">
 						<view class="title_2">专属</view>
 						<view class="desc_2">定制精品</view>
-						<image src="https://t17.9026.com/web/statics/image/index/6.png" mode=""></image>
+						<image :src="homePages[7].data.list[2].pic_url" mode=""></image>
 					</view>
 				</view>
 			</view>
 			<scroll-view scroll-x="true">
 				<view class="main-left w">
-					<view class="item" v-for="(item,index) in qwe" :key="index">
+					<view class="item" v-for="(item,index) in homePages[8].data.navs" :key="index">
 						<image class="borradu_20"
-							:src="`https://t17.9026.com/web/statics/image/index/temporary/${item.cover_image}.png`"
+							:src="item.icon_url"
 							mode=""></image>
-						<view class="title_2">{{item.title}}</view>
+						<view class="title_2">{{item.name}}</view>
 						<view class="desc_2">独到品味的代表备份</view>
 					</view>
 				</view>
@@ -128,11 +128,11 @@
 		<view class="group_list">
 			<swiper style="height: 606rpx;" :indicator-dots="false" :autoplay="false" :interval="3000" :duration="1000"
 				previous-margin="75rpx" next-margin="75rpx">
-				<swiper-item class="" v-for="(item,index) in 3" :key="index"
-					@click="goPage('/plugins/pt/goods/goods?goods_id=29')">
+				<swiper-item class="" v-for="(item,index) in homePages[9].data.list" :key="index"
+					@click="goPage(item.page_url)">
 					<view class="item">
 						<view class="imgBox">
-							<image class="img" src="https://t17.9026.com/web/statics/image/index/3.png"></image>
+							<image class="img" :src="item.cover_pic"></image>
 						</view>
 						<view class="b_card main-between">
 							<view class="main-left cross-center left">
@@ -143,7 +143,7 @@
 								<view class="i">45</view>
 							</view>
 							<view class="right">
-								<view class="price"><text class="rmb">￥</text><text>56800</text><text
+								<view class="price"><text class="rmb">￥</text><text>{{item.pintuan_price}}</text><text
 										class="dw">元</text></view>
 							</view>
 						</view>
@@ -200,6 +200,7 @@
 </template>
 
 <script>
+	import {mapState} from 'vuex'
 	import appScrollList from './components/scroll-list.vue'
 	export default {
 		components: {
@@ -214,6 +215,33 @@
 					};
 				},
 			},
+			page_id:{
+				type:Number,
+				default:0
+			},
+			dIndex: {
+				type: Array,
+				default () {
+					return [0, 0];
+				}
+			},
+			mIndex: {
+				type: Array,
+				default () {
+					return [0, 0];
+				}
+			},
+			dType:String
+		},
+		computed:{
+			...mapState({
+				selectedProperties:state=>state.user.selectedProperties
+			})
+		},
+		watch:{
+			selectedProperties(){
+				this.getComposition()
+			},
 		},
 		data() {
 			return {
@@ -239,12 +267,13 @@
 						image: 'https://t17.9026.com/web/statics/image/index/temporary/jhk-1634283667210.png',
 						title: '定制产品',
 						tag: '预约',
-						link: '/pages/case/appointment/appointment-form'
+						link: '/pages/case/appointment/appointment-list'
 					},
 					{
 						image: 'https://t17.9026.com/web/statics/image/index/2.png',
 						title: '明星套装',
-						tag: '套装'
+						tag: '套装',
+						link: '/pages/case/appointment/appointment-list'
 					}
 				],
 				// jdlg: [{
@@ -266,21 +295,24 @@
 				// 		cover_image: 'temporary/jhk-1634284367308'
 				// 	}
 				// ],
-				qwe: [
-					{
-						'title': '兴城人居',
-						'cover_image': 'jhk-1634283667210'
-					}, {
-						'title': '世龙广场',
-						'cover_image': 'jhk-1634284372084'
-					}, {
-						'title': '新中式',
-						'cover_image': 'jhk-1634283687206'
-					}, 
-				]
-
+				// qwe: [
+				// 	{
+				// 		'title': '兴城人居',
+				// 		'cover_image': 'jhk-1634283667210'
+				// 	}, {
+				// 		'title': '世龙广场',
+				// 		'cover_image': 'jhk-1634284372084'
+				// 	}, {
+				// 		'title': '新中式',
+				// 		'cover_image': 'jhk-1634283687206'
+				// 	}, 
+				// ],
+				compositionList:[],//本期家点灵感
 			}
 		},
+		created() {
+			this.getComposition()
+		},
 		methods: {
 			selectCat(index){
 				this.bottom_goods_index=index
@@ -293,7 +325,87 @@
 				uni.navigateTo({
 					url: url
 				})
-			}
+			},
+			//获取推荐套餐
+			getComposition(){
+				this.$request({
+					url:this.$api.composition.list,
+					data:{
+						is_recommend:1,
+						limit:3
+					},
+					method:'post'
+				}).then(res=>{
+					if(res.code===0){
+						this.compositionList=res.data.list
+					}
+				})
+			},
+			//领取优惠券
+			receive(index) {
+				let list = this.homePages[6].data.coupon_list
+				if (this.sign == 'integral-mall') {
+					this.$jump({
+						url: list[index].page_url,
+						open_type: 'navigate'
+					});
+					return;
+				}
+				if (list[index].is_receive == 1) {
+					uni.showToast({
+						mask: true,
+						title: '已领取',
+						icon: 'none'
+					});
+					return true;
+				}
+				uni.showLoading({
+					mask: true,
+					title: '领取中'
+				});
+			
+				this.$request({
+					url: this.$api.coupon.receive,
+					data: {
+						coupon_id: list[index].id
+					}
+				}).then(e => {
+					uni.hideLoading();
+					if (e.code === 0) {
+						if (e.data.rest == 0) {
+							this.homePages[6].data.coupon_list[index].is_receive = '1';
+						}
+						let tempList = this.homePages[6].data.coupon_list;
+						this.flushCache(tempList);
+						this.$store.dispatch('page/actionSetCoupon', {
+							list: [Object.assign(tempList[index], e.data)],
+							type: 'receive'
+						});
+					} else {
+						uni.showToast({
+							title: e.msg,
+							icon: 'none'
+						});
+					}
+				}).catch(() => {
+					uni.hideLoading();
+				});
+			},
+			flushCache(coupon_list) {
+				if (this.page_id == 0) {
+					let storage = this.$storage.getStorageSync('INDEX_MALL');
+					let dIndex = this.dIndex;
+					let mIndex = this.mIndex;
+			
+					if (this.dType === 'module') {
+						storage.home_pages.navs[mIndex[0]].template.data[mIndex[1]].data.list[dIndex[0]].data[dIndex[1]]
+							.data.coupon_list = coupon_list;
+					} else {
+						storage.home_pages.navs[dIndex[0]].template.data[dIndex[1]].data.coupon_list = coupon_list;
+					}
+					this.$storage.setStorageSync('INDEX_MALL', storage);
+				}
+			},
 		}
 	}
 </script>

src/pages/order-submit/app-coupon-pick.vue

@@ -151,9 +151,17 @@
         },
         computed: {
             ...mapState({
-                appImg: state => state.mallConfig.__wxapp_img
+                appImg: state => state.mallConfig.__wxapp_img,
+				customerAccessToken:state=>state.user.customerAccessToken  //代客下单判断是否选择客户，来获取客户优惠券
             }),
         },
+		watch:{
+			customerAccessToken(){
+				this.$store.commit('orderSubmit/mutSetMchNoCouponStatusList', []);
+				this.loadData();
+				this.loadData(true);
+			}
+		},
         created() {
             this.$store.commit('orderSubmit/mutSetMchNoCouponStatusList', []);
             this.is_gift = typeof(this.theme) == 'string' && this.theme.indexOf('gift') >= 0 ? true : false;

src/pages/order-submit/order-submit.vue

@@ -163,11 +163,7 @@
 						<app-submit-goods :theme="theme" v-on:updateList="updateList" :index="mchIndex" :plugin="plugin"
 							:list="mch"></app-submit-goods>
 						<view class="line"></view>
-						<template v-if="(mch.coupon && mch.coupon.enabled) ||
-                                (mch.member_discount > 0 || mch.member_discount < 0) ||
-                                (mch.integral && mch.integral.can_use) || mch.temp_vip_discount ||
-                                (mch.insert_rows && mch.insert_rows.length) ||
-                                (mch.full_reduce_discount > 0 || mch.full_reduce_discount < 0)">
+						<template v-if="(mch.coupon && mch.coupon.enabled)">
 							<view style="padding: 20rpx 32rpx;">
 								<template v-if="mch.coupon && mch.coupon.enabled">
 									<view @click="showCouponPicker(mchIndex)" style="padding: 16rpx 0;">
@@ -700,6 +696,9 @@
 						this.$store.commit('user/isOrderBehalfBustomers', true);
 						
 						delete this.previewData.address
+						const formData = this.$store.state.orderSubmit.formData;
+						formData.list[0].user_coupon_id = 0;
+						this.$store.commit('orderSubmit/mutSetFormData', formData);
 					}else{
 						uni.showToast({
 							title:res.msg,
@@ -857,6 +856,7 @@
 				}
 			},
 			loadPreviewData() {
+				console.log(2222222222222223333333333333)
 				this.loadingPreviewData = true;
 				uni.showLoading({
 					mask: true,

src/pages/sale/cusmter/addCustomer.vue

@@ -28,10 +28,10 @@
 				<view class="field" style="font-weight: bold;" >{{index===0?'楼盘信息':''}}</view>
 				<view class="main-right" style="width: 210rpx;height: 100%;">
 					<view class="cross-center curd-btn" @click="addOrDel()" v-if="index==form.estates.length-1">
-						<image src="../../../static/image/sale/tianjia.png" mode=""></image>添加
+						<image src="https://t17.9026.com/web/statics/image/sale/tianjia.png" mode=""></image>添加
 					</view>
 					<view class="cross-center curd-btn" @click="addOrDel(index)" style="margin-left: 30rpx;" v-if="form.estates.length>1">
-						<image src="../../../static/image/sale/shanchu.png" mode=""></image>删除
+						<image src="https://t17.9026.com/web/statics/image/sale/shanchu.png" mode=""></image>删除
 					</view>
 				</view>
 			</view>

src/pages/sale/cusmter/info.vue

@@ -14,7 +14,7 @@
 			</view>
 			<navigator :url="`/pages/sale/cusmter/addCustomer?id=${info.id}`" hover-class="none">
 			<view class="cross-center edit">
-				<image style="width: 27rpx;height: 26rpx;" src="../../../static/image/sale/edit.png" mode=""></image>编辑
+				<image style="width: 27rpx;height: 26rpx;" src="https://t17.9026.com/web/statics/image/sale/edit.png" mode=""></image>编辑
 			</view>
 			</navigator>
 		</view>

src/pages/sale/sale-user-center.vue

@@ -181,6 +181,7 @@
 				account_bar_status: function() {
 					return this.userCenter.account_bar ? this.userCenter.account_bar.status : 0;
 				},
+				info:state => state.user.info
 				// #ifdef H5
 				isWechat: function() {
 					return this.$jwx.isWechat();
@@ -359,6 +360,11 @@
 			// #ifdef H5
 			this.$jwx.config();
 			// #endif
+			if(!this.info.salesperson_info){
+				uni.navigateTo({
+					url:'/pages/sale/sale_login/sale_login'
+				})
+			}
 		},
 		onShow() {
 			this.$event.on(this.$const.EVENT_USER_LOGIN).then(() => {

src/pages/sale/salePersonInfo.vue

@@ -3,8 +3,8 @@
 		<view class="main-between cross-center list-item">
 			<view class="title">头像</view>
 			<view class="main-right cross-center">
-				<image class="head" :src="info.salesperson_info?info.avatar:'../../static/image/index/head_port.png'" mode=""></image>
-				<image class="arrow-right" src="../../static/image/index/arrow-right-gray.png" mode=""></image>
+				<image class="head" :src="info.salesperson_info?info.avatar:'https://t17.9026.com/web/statics/image/index/head_port.png'" mode=""></image>
+				<image class="arrow-right" src="https://t17.9026.com/web/statics/image/index/arrow-right-gray.png" mode=""></image>
 			</view>
 		</view>
 		<view class="line"></view>

src/pages/sale/sale_login/sale_login.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<app-layout>
 		<view class="main-center autoCenter">
 			<image style="width: 229rpx; height: 58rpx;" src="https://t17.9026.com/web/statics/image/sale/xcrj_login.png" mode="">
 			</image>
@@ -19,30 +19,17 @@
 			<view class="forget" @click="forgetPwd">忘记密码</view>
 			<button class="submit" type="default" @click="login">登录</button>
 		</view>
-	</view>
+	</app-layout>
 </template>
 
 <script>
-	import {mapState} from "vuex"
 	export default {
 		data() {
 			return {
-				account:'wangwu',
-				password:'qweqweqwe',
+				account:'',
+				password:'',
 			};
 		},
-		computed:{
-			...mapState({
-				info:state => state.user.info
-			})
-		},
-		onLoad() {
-			if(this.info.salesperson_info){
-				uni.navigateTo({
-					url:'/pages/sale/sale-user-center'
-				})
-			}
-		},
 		methods:{
 			login(){
 				this.$request({

src/pages/user-center/evaluate/list.vue

@@ -39,7 +39,7 @@
 							<image v-for="(item1, index1) in item.pic_url" :key="index1" :src="item1" mode=""></image>
 						</view>
 						<view class="main-between goods">
-							<view class="main-left desc">
+							<view class="main-left desc" @click="$jump({open_type:'navigate',url:`/pages/goods/goods?id=${item.goods_id}`})">
 								<image class="goods-img" :src="item.cover_img" mode=""></image>
 								<view>
 									<view class="title t-omit">{{item.goods_name}}</view>
@@ -58,7 +58,7 @@
 					</template>
 				</view>
 			</view>
-
+			<appNoData v-if="evaluateList.length==0" :title="'暂无评价'"></appNoData>
 			<view class="no-more" v-if="noMore">没有更多了...</view>
 		</view>
 	</app-layout>
@@ -68,7 +68,11 @@
 	import {
 		mapState
 	} from "vuex"
+	import appNoData from '@/components/page-component/app-no-goods/app-no-goods.vue';
 	export default {
+		components:{
+			appNoData
+		},
 		data() {
 			return {
 				page: 1,

src/plugins/composition/components/app-bd-info/app-bd-info.vue

@@ -24,7 +24,7 @@
 			</view>
 			<view class="cross-bottom">
 				<view class="main-center cross-center receive" @click="receive" v-if="coupons.length>0">
-					领券<image src="../../../../static/image/index/arrow-right-facet-white.png" mode=""></image>
+					领券<image src="https://t17.9026.com/web/statics/image/index/arrow-right-facet-white.png" mode=""></image>
 				</view>
 			</view>
 		</view>

src/static/css/hxj.scss

@@ -83,3 +83,8 @@
 	}
 }
 
+.hxj-line{
+	width: 100%;
+	height: 1px;
+	background-color:#CACACA;
+}