Merge branch 'master' of http://git.cc-lotus.info/pointToNetwork/point-app

pagesHome/order/appraise.vue

@@ -3,7 +3,7 @@
 		<view class="main">
 			<view class="one">
 				<view class="one_1">
-					<view class="text1">{{info.goods.name}}{{info.specs[0].name}}</view>
+					<view class="text1">{{info&&info.goods&&info.goods.name}}</view>
 					<!-- <view class="text2">好评率 <text>{{info.rate||100}}%</text></view> -->
 				</view>
 				<view class="one_2">
@@ -16,7 +16,9 @@
 				<scroll-view scroll-y="true" class="scroll-view">
 					<view class="list-scroll-view">
 						<view class="list" v-for="(item, index) in list" :key="index">
-							<image v-if="item.customer.icon&&item.customer.icon.length>0" class="image" :src="item.customer.icon&&item.customer.icon.length>0?item.customer.icon[0].url:''" mode="">
+							<image v-if="item.customer&&item.customer.icon&&item.customer.icon.length>0" class="image"
+								:src="item.customer.icon&&item.customer.icon.length>0?item.customer.icon[0].url:''"
+								mode="">
 							</image>
 							<text v-else class="iconfont icon-top"></text>
 							<view class="list_1">
@@ -43,7 +45,9 @@
 										</view>
 										<view v-if="item.customer._id==user._id" @tap="toReply(item,indexx)">回复</view>
 									</view>
-									<uni-easyinput v-if="reply.reply&&reply.customer._id==user._id&&reply._id==item._id&&reply.index==indexx" class="input" maxlength=-1 type="textarea" @change="confirm" placeholder="评论" />
+									<uni-easyinput
+										v-if="reply.reply&&reply.customer._id==user._id&&reply._id==item._id&&reply.index==indexx"
+										class="input" maxlength=-1 type="textarea" @change="confirm" placeholder="评论" />
 								</view>
 							</view>
 						</view>

pagesHome/order/detail.vue

@@ -525,9 +525,8 @@
 			},
 			// 计数器
 			toCount(e) {
-				console.log(e);
-				// const that = this;
-				// that.$set(that, `buy_num`, e)
+				const that = this;
+				that.$set(that, `buy_num`, e)
 			},
 			// 立即购买
 			async toBuy() {

pagesRest/recom/index.vue

@@ -35,7 +35,7 @@
 									<text class="act" v-for="(tag,index) in item.p_act" :key="index">{{tag}}</text>
 								</view>
 								<view class="acttags">
-									<text v-for="i in item.actTagsShow" :key="i">{{i.label}}</text>
+									<text v-for="(i,indexx) in item.actTagsShow" :key="indexx">{{i.label}}</text>
 								</view>
 							</view>
 						</view>
@@ -276,11 +276,12 @@
 								}
 							}
 						}
+
 						.leader {
 							font-size: 12px;
 							text-align: center;
 							color: #23B67A;
-						
+
 							text:last-child {
 								font-size: 16px;
 								padding: 0 0 0 1vw;