修改冲突

pagesA/getReadyDan/getReadyDan-two.vue

@@ -84,7 +84,7 @@
 				</view>
 			</view>
 			<!-- 快递费用 -->
-			<view v-if="isExpress" class="bacf radius20 mar-s20 disjbac pad-sx27-zy20">
+			<view v-if="isExpress && has_postage==1" class="bacf radius20 mar-s20 disjbac pad-sx27-zy20">
 				<view class="bold">快递费用</view>
 				<view class="fon28 colf8 bold">￥{{expressInfo.default_price}}</view>
 			</view>
@@ -183,6 +183,7 @@
 				showQuan:false,//是否显示优惠券弹框
 				isDui:false,
 				orderList:uni.getStorageSync('orderList'),
+				has_postage:uni.getStorageSync('has_postage'),
 				quanList:[],
 				goAddress:'四川省成都市青羊区青羊大道213号',
 				youQuan:{
@@ -641,7 +642,11 @@
 								res.data.forEach(item=>{
 									if(item.is_default==1){
 										this.expressInfo = item;
-										this.expressInfo.default_price = this.expressInfo.default_price/100;
+										if(this.has_postage==1){
+											this.expressInfo.default_price = this.expressInfo.default_price/100;
+										} else {
+											this.expressInfo.default_price = 0;
+										}
 									}
 								})
 								this.totalEv();
@@ -664,7 +669,7 @@
 			totalEv(){//合计运算
 				if(this.isNei!=3) {
 					// 商品订单合计
-					this.allPrice = this.zanAllPrice - this.youQuan.youPrice;
+					// this.allPrice = this.zanAllPrice - this.youQuan.youPrice;
 					if(this.payType=='coin'){
 						this.obtainCoin(this.payFS[0].num);
 					}

pagesA/my-diary/my-diary.vue

@@ -22,7 +22,7 @@
 		</view>
 		<!-- 底部按钮 -->
 		<view class="posixzy pad-sx25">
-			<view @tap="goAddDiary" class="fon30 radius20 tc colf bold" style="margin: 0 83rpx;height: 90rpx;line-height: 90rpx;" :style="{background:publicColor}">添加日记</view>
+			<view @tap="goAddDiary" class="fon30 radius20 tc colf bold" style="margin: 0 83rpx;bottom:51px;height: 90rpx;line-height: 90rpx;" :style="{background:publicColor}">添加日记</view>
 		</view>
 		<!-- 底部客服 -->
 		<public-customer></public-customer>

pagesB/problemDetail/problemDetail.vue

@@ -40,24 +40,29 @@
 							</view>
 							<view class="disac flexs">
 								<view class="disac fc" @tap="tapLike" style="width: 60rpx;">
+									<image src="/static/public/looks.png"
+										style="width: 42rpx;height: 42rpx;" mode=""></image>
+									<view class="fon24 col9 tc">{{detailObj.views}}</view>
+								</view>
+								<view class="disac fc mar-zy36" @tap="tapLike" style="width: 60rpx;">
 									<image v-if="isDetailLike" src="/static/public/detail-like.png"
 										style="width: 42rpx;height: 42rpx;" mode=""></image>
 									<image v-else src="/static/public/detail-nlike.png"
 										style="width: 42rpx;height: 42rpx;" mode=""></image>
-									<view class="fon24 col9 tc">{{likeCon}}</view>
+									<view class="fon24 col9 tc">{{detailObj.likes}}</view>
 								</view>
-								<view class="disac fc mar-zy36 posir">
+								<!-- <view class="disac fc mar-zy36 posir">
 									<image src="/static/public/weix.png" style="width: 42rpx;height: 42rpx;" mode=""></image>
 									<view class="fon24 col9">分享</view>
 									<button class="posia" open-type="share"
 										style="top: 0;right: 0;left: 0;bottom: 0;opacity: 0;">分享</button>
-								</view>
+								</view> -->
 								<view class="disac fc" @tap="tapConllection">
 									<image v-if="isDetailConllection" src="/static/public/yconllection.png"
 										style="width: 44rpx;height: 44rpx;" mode=""></image>
 									<image v-else src="/static/public/conllection.png"
 										style="width: 44rpx;height: 44rpx;" mode=""></image>
-									<view class="fon24 col9">收藏</view>
+									<view class="fon24 col9">{{detailObj.collects>1000?'999+':detailObj.collects}}</view>
 								</view>
 							</view>
 						</view>
@@ -597,6 +602,11 @@
 					action: isLikeCon,
 					archive_id: this.detailObj.id
 				})
+				if(!this.isDetailConllection){
+					this.detailObj.collects++
+				} else {
+					this.detailObj.collects--
+				}
 				this.isDetailConllection = !this.isDetailConllection
 			},
 			backTop() { //回到顶部事件

pagesB/shopDetail/shopDetail.vue

@@ -574,6 +574,8 @@
 					checkGrounpId:this.detailObj.id,//查询拼团列表ID
 					is_activity:this.detailObj.is_activity
 				}
+				//0：包邮，1：不包邮
+				uni.setStorageSync('has_postage',this.detailObj.has_postage);
 				let newList = [params];
 				uni.setStorageSync('orderList',newList);
 				if(this.isNei!=3) {

pagesB/shopSearch/shopSearch.vue

@@ -332,6 +332,7 @@
 									},1000)
 								} else {
 									this.dataList = this.zanArr;
+									this.search_result = true;
 								}
 							} else {
 								this.search_result = true;