成功页优化

ghsApp/src/pagesOrder/detail.vue

@@ -157,11 +157,21 @@
 				<div class="module-com input-line-wrap">
 					<tui-list-cell class="line-cell" v-if="detailInfo.sendCost > 0" :hover="false">
 						<div class="tui-title">运费</div>
-						<div class="detail-price_box" style="font-size: 28upx">¥{{ parseFloat(detailInfo.sendCost) }}</div>
+						<div class="detail-price_box" style="font-size: 28upx">
+							¥{{ detailInfo.sendCost?parseFloat(detailInfo.sendCost):0 }}
+						</div>
+					</tui-list-cell>
+					<tui-list-cell class="line-cell" v-if="detailInfo.packCost > 0" :hover="false">
+						<div class="tui-title">打包费</div>
+						<div class="detail-price_box" style="font-size: 28upx">
+							¥{{ detailInfo.packCost?parseFloat(detailInfo.packCost):0 }}
+						</div>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" v-if="detailInfo.labourCost > 0" :hover="false">
 						<div class="tui-title">人工资材费</div>
-						<div class="detail-price_box" style="font-size: 28upx">¥{{ parseFloat(detailInfo.labourCost) }}</div>
+						<div class="detail-price_box" style="font-size: 28upx">
+							¥{{ detailInfo.labourCost?parseFloat(detailInfo.labourCost):0 }}
+						</div>
 					</tui-list-cell>
 					<tui-list-cell v-if="detailInfo.discountAmount > 0" class="line-cell" :hover="false">
 						<div class="tui-title"><text v-if="detailInfo.discountType == 4">红包</text><text v-else>优惠金额</text></div>

hdApp/src/admin/billing/affirmGhs.vue

@@ -30,12 +30,14 @@
 
 									<view style="text-align:right;">
 										<view class="open-bx" >
-											<i class="iconfont iconjian" @click="delItem(item)" v-if="item.bigCount > 0 || item.smallCount > 0"></i>
-											<text class="num" @click="customUpdate(item)">
-											<text v-if="item.bigCount > 0" style="font-size:24upx;font-weight:bold;color:#3385ff;">{{ item.bigCount }}</text>
-											<text v-if="item.smallCount > 0" style="font-size:24upx;"><text v-if="item.bigCount > 0">/</text>{{ item.smallCount }}</text>
+											<text class="num">
+												<text v-if="item.bigCount > 0" style="font-size:24upx;font-weight:bold;color:#3385ff;">
+													{{ item.bigCount }}{{item.bigUnit}}
+												</text>
+												<text v-if="item.smallCount > 0" style="font-size:24upx;">
+													{{ item.smallCount }}{{item.smallUnit}}
+												</text>
 											</text>
-											<i class="iconfont iconzeng" @click="addEvents(item)"></i>
 										</view>
 									</view>
 
@@ -63,12 +65,12 @@
 							<text style="color: #3385FF;width:100%;">出车有经过或到店拿货的花店，免运费，请选【自取】</text>
 						</view>				
 						<view v-else>
-							<text style="width:100%;color:#CCCCCC;">使用跑腿，需要配送费</text>
+							<text style="width:100%;color:#CCCCCC;">需要配送费</text>
 						</view>
 					</tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="true" v-if="form.sendType == 3" @click="modifyAddress">
-						<view class="tui-title">地址</view>
+						<view class="tui-title">收花地址</view>
 						<view v-if="!$util.isEmpty(shopInfo.lat) && !$util.isEmpty(shopInfo.long)">
 							<view><text>{{shopInfo.fullAddress}}</text></view>
 							<view><text>{{shopInfo.showAddress}}</text></view>
@@ -81,6 +83,11 @@
 					<text style="color: #3385FF">¥{{ form.sendCost }}</text>
 					</tui-list-cell>
 
+					<tui-list-cell class="line-cell" :hover="false" v-if="form.sendType == 3 && Number(form.packCost)>0">
+					<view class="tui-title">打包费</view>
+					<text style="color: #3385FF">¥{{ form.packCost }}</text>
+					</tui-list-cell>
+
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 						<view class="tui-title">总金额</view>
 						<text style="color: #3385FF">¥{{ modifyPrice }}</text>
@@ -108,20 +115,6 @@
 			<button class="admin-button-com blue big" @click="affirmFormSubmit">提交</button>
 		</view>
 
-		<modal-module :show="isModel" @cancel="modalCancel" @click="affirm" :title="customData.itemName" color="#333" :size="32" padding="30rpx 30rpx" >
-			<template slot="customContent">
-				<view class="select-cmd_bx" v-if="customData">
-					<view class="kc"> </view>
-					<view class="num_bx">
-						<input v-if="globalUnitType == 0" v-model="customData.bigCount" :focus="isFocus" type="number" placeholder="扎数" />
-						<input v-if="globalUnitType == 1" v-model="customData.smallCount" :focus="isFocus" type="number" placeholder="支数" />
-						<image @click="switchGlobalUnitType" :src="`${constant.imgUrl}/icon/switch/switch128.png`" v-if="customData.smallShow && customData.smallShow==1"
-						style="width:86upx;height:86upx;position:absolute;top:136upx;right:55upx;" mode="widthFix"></image>
-					</view>
-				</view>
-			</template>
-		</modal-module>
-
 	</view>
 </template>
 
@@ -188,7 +181,8 @@ export default {
 				sendCost: 0,
 				customId: "",
 				product: "",
-        		hbId: '0'
+        		hbId: '0',
+				packCost:0
 			},
 			showCustomer: false,
 			today:'',
@@ -407,6 +401,7 @@ export default {
 		getGhsData(id) {
 			getGhsDataApi({id:id}).then(res => {
 				this.ghsInfo = res.data
+				this.form.packCost = res.data.packCost?parseFloat(res.data.packCost):0
 			});
 		},
 		countAllPrices(e){
@@ -631,11 +626,9 @@ export default {
 					display: inline-block;
 					width: 120upx;
 					height:45upx;
-					text-align:center;
+					text-align:right;
 					margin: 0 8upx;
 					color: #868686;
-					border-radius: 22upx;
-					background-color: #f5f5f5;
 					padding: 3upx 0;
 					font-size: 25upx;
 				}

hdApp/src/admin/shop/add.vue

@@ -153,6 +153,7 @@ export default {
 				province: '',
 				city: '',
 				address: '',
+				showAddress:'',
 				floor: '',
 				open: 1,
 				openType: 0, // openType: 0. 表示 24小时营业 1. 表示 xx ~ xx
@@ -283,10 +284,10 @@ export default {
 			this.form.img = val;
 		},
 		changeAreaFn(e) {
-			console.log('changeAreaFn', e)
 			this.form.address = e.title
 			this.region.lat = e.location.lat
 			this.region.long = e.location.lng
+			this.form.showAddress = e.address
 		},
 		// 省市联动
 		openAddres() {
@@ -316,11 +317,6 @@ export default {
 				this.$msg(promptText)
 				uni.removeStorageSync('currentShopInfo')
 
-				//返回上一页带参数
-				let pages = getCurrentPages();
-				let prevPage = pages[ pages.length - 2 ];
-				//修改上一页data里面的sendData
-				//prevPage.$vm.sendData = {hasUpdate:1,id:item.id,fullAddress:item.fullAddress,showAddress:item.showAddress}
 				uni.navigateBack({})
 
 			})

hdApp/src/pagesPurchase/particulars.vue

@@ -7,8 +7,15 @@
         <view class="result-title">支付成功</view>
 
         <button class="admin-button-com big" @click="goDetail">订单详情</button>
-        <button v-if="ghsCgScene!=''" class="admin-button-com big" @click="goHome">返回首页</button>
-        <button v-else class="admin-button-com big" @click="goBack">返回</button>
+        <button v-if="ghsCgScene!=''" class="admin-button-com big" style="margin-top:20upx;" @click="goHome">返回首页</button>
+        <button v-else class="admin-button-com big" style="margin-top:20upx;" @click="goBack">返回</button>
+
+        <view style="margin-top:20upx;">
+          <view style="font-size:28upx;">微信下拉，在最近使用小程序，找到绿色【花掌柜】，点击即可再次下单</view>
+          <view style="margin-bottom:30upx;margin-top:15upx;">
+            <image class="image" :src="`${constant.imgUrl}/cg/hd_cg_route.png`" mode="widthFix"></image>
+          </view>
+        </view>
 
       </view>
     </view>
@@ -65,7 +72,7 @@ export default {
 <style lang="scss" scoped>
 .billing_box_bg {
   position: relative;
-  padding: 60upx 30upx;
+  padding: 30upx 30upx;
   display: flex;
   flex-direction: column;
   background-color: #f5f5f5;
@@ -83,7 +90,7 @@ export default {
     display: flex;
     flex-direction: column;
     align-items: center;
-    padding: 70upx;
+    padding: 30upx 70upx 70upx 70upx;
     width: 100%;
     background: #ffffff;
     border-radius: 20upx;
@@ -93,7 +100,7 @@ export default {
       color: $mainColor1;
     }
     .result-title {
-      margin: 50upx 0 70upx;
+      margin: 20upx 0 50upx;
       font-size: 32upx;
     }
     .close_btn {

hdApp/src/pagesPurchase/purDetails.vue

@@ -151,11 +151,15 @@
         <div class="module-com input-line-wrap">
           <tui-list-cell class="line-cell" :hover="false" v-if="Number(detailInfo.sendCost)>0">
             <div class="tui-title">运费</div>
-            <div class="detail-price_box" style="font-size: 28upx;">¥{{ parseFloat(detailInfo.sendCost)||0 }}</div>
+            <div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.sendCost?parseFloat(detailInfo.sendCost):0 }}</div>
+          </tui-list-cell>
+          <tui-list-cell class="line-cell" :hover="false" v-if="Number(detailInfo.packCost)>0">
+            <div class="tui-title">打包费</div>
+            <div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.packCost?parseFloat(detailInfo.packCost):0 }}</div>
           </tui-list-cell>
           <tui-list-cell class="line-cell" :hover="false" v-if="Number(detailInfo.labourCost)>0">
             <div class="tui-title">人工资材费</div>
-            <div class="detail-price_box" style="font-size: 28upx;">¥{{ parseFloat(detailInfo.labourCost)||0 }}</div>
+            <div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.labourCost?parseFloat(detailInfo.labourCost):0 }}</div>
           </tui-list-cell>
           <tui-list-cell class="line-cell" :hover="false" v-if="detailInfo.discountAmount > 0">
             <div class="tui-title"><text v-if="detailInfo.discountType == 4">红包优惠</text><text v-else>优惠</text></div>