优化

hdApp/src/admin/billing/affirmGhs.vue

@@ -226,17 +226,13 @@
 				</view>
 				<!-- 登录信息 -->
 				<view class="module-com input-line-wrap">
-<!--					<tui-list-cell class="line-cell" :hover="false" :arrow="true">-->
-<!--						<view class="tui-title ">客户</view>-->
-<!--						<view class="tui-input" v-if="form.customId" @click="showCustomer = true">{{ form.customName }}</view>-->
-<!--						<view class="tui-placeholder" style="width: 100%" v-else @click="showCustomer = true">请选择客户</view>-->
-<!--					</tui-list-cell>-->
+
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 						<view class="tui-title ">送货</view>
 						<button @click="form.sendType=1" class="admin-button-com mini-btn" :class="form.sendType==1?'blue':'default'">配送</button>
 						<button @tap="form.sendType=2" class="admin-button-com mini-btn" :class="form.sendType==2?'blue':'default'">自取</button>
 					</tui-list-cell>
-						<!-- <appSendTime :placeholder="'默认30分钟后配送'" @alterTime="purchaseFreight(ghsMsg)" :sendDate.sync="form.sendDate" :sendTime.sync="sendTime" ></appSendTime> -->
+
             <appTimer :placeholder="'默认30分钟后配送'" @confirm="onConfirm" :sendTime="sendTime"></appTimer>
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false" v-show="form.sendType == 1">
 						<view class="tui-title ">运费</view>
@@ -249,15 +245,6 @@
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 						<textarea style="height: 100rpx" v-model="remark" placeholder="备注..."/>
 					</tui-list-cell>
-          
-<!--					<tui-list-cell class="line-cell" :hover="false" :arrow="false">-->
-<!--						<view class="tui-title ">结算方式</view>-->
-<!--						<button @tap="form.debt=1" class="admin-button-com mini-btn" :class="form.debt==1?'blue':'default'">欠款</button>-->
-<!--						<button @click="form.debt=0" class="admin-button-com mini-btn" :class="form.debt==0?'blue':'default'">已收款</button>-->
-<!--					</tui-list-cell>-->
-
-
-<!--					<appFormSend :form.sync="form"> </appFormSend>-->
 				</view>
 			</form>
 		</view>
@@ -270,14 +257,11 @@
 					<text class="large" v-else-if="form.sendType==1 && couponSumText">{{ allPrice + Number(form.sendCost) - Number(couponSumText)  }}</text>
 					<text class="large" v-else-if="form.sendType==2 && !couponSumText">{{ allPrice}}</text>
 					<text class="large" v-else-if="form.sendType==2 && couponSumText">{{ NumberSub(allPrice, Number(couponSumText))}}</text>
-					<!-- <text class="large" v-else-if="!form.sendType && !couponSumText">{{ allPrice }}</text> -->
-					<!-- <text class="large" v-else-if="!form.sendType && couponSumText">{{ NumberSub(allPrice, Number(couponSumText)) }}</text> -->
 				</text>
 			</view>
 			<button class="admin-button-com blue middle" @click="affirmFormSubmit">提交</button>
 		</view>
-		<!-- 选择客户 -->
-<!--		<AppCustomerSel :show.sync="showCustomer" @change="changeCustomerFn" />-->
+
 	</view>
 </template>
 
@@ -476,7 +460,7 @@ export default {
 				remark:this.remark,
 				product:JSON.stringify(product),
 				ghsId:this.ghsMsg.id,
-        couponId: this.form.couponId
+        		couponId: this.form.couponId
 			}
 			let self = this;
 			uni.showModal({
@@ -485,12 +469,12 @@ export default {
 				success: function (res) {
 					if (res.confirm) {
 						createOrder(parameter).then(res => {
-							const {data: { orderSn,actPrice }} = res;
-							self.pageTo({url: `/pagesPurchase/wechatPay?type=2&orderSn=${orderSn}&actPrice=${actPrice}`, type: 2})
-              setTimeout(() => {
-                uni.removeStorageSync('selectCouponInfo')
-                self.resetSelectInfoByType(self.pageType);
-              }, 600)
+							const {data: { orderSn,realPrice }} = res;
+							self.pageTo({url: `/pagesPurchase/wechatPay?type=2&orderSn=${orderSn}&realPrice=${realPrice}`, type: 2})
+							setTimeout(() => {
+								uni.removeStorageSync('selectCouponInfo')
+								self.resetSelectInfoByType(self.pageType);
+							}, 600)
 						});
 					}
 				}

hdApp/src/pagesPurchase/orderItem.vue

@@ -34,7 +34,7 @@
           <text class="info-value">{{ info.bigNum }} / {{info.smallNum}}</text>
         </view>
       </view>
-      <view class="item-price">¥{{ info.actPrice }} <text class="iconfont iconxiangyou"></text>
+      <view class="item-price">¥{{ info.realPrice }} <text class="iconfont iconxiangyou"></text>
       </view>
     </view>
   </view>

hdApp/src/pagesPurchase/purDetails.vue

@@ -132,14 +132,14 @@
             v-if="Number(detailInfo.discountAmount) > 0"
           >
             <div class="tui-title">优惠金额</div>
-            <div class="detail-price_box">-¥{{ detailInfo.discountAmount }}</div>
+            <div class="detail-price_box">-¥{{ detailInfo.discountAmount || 0.00 }}</div>
           </tui-list-cell>
           <tui-list-cell
             class="line-cell"
             :hover="false"
           >
             <div class="tui-title">总金额</div>
-            <div class="detail-price_box red">¥{{ detailInfo.actPrice || 0.00 }}</div>
+            <div class="detail-price_box red">¥{{ detailInfo.realPrice || 0.00 }}</div>
           </tui-list-cell>
         </div>
       </view>
@@ -235,7 +235,7 @@ export default {
     },
     toPay () {
       uni.navigateTo({
-        url: `/pagesPurchase/wechatPay?type=2&orderSn=${this.detailInfo.orderSn}&actPrice=${this.detailInfo.actPrice}`
+        url: `/pagesPurchase/wechatPay?type=2&orderSn=${this.detailInfo.orderSn}&realPrice=${this.detailInfo.realPrice}`
       })
     },
     getError () {

hdApp/src/pagesPurchase/wechatPay.vue

@@ -16,7 +16,7 @@
         <block>
           <div class="price">
             <span>￥</span>
-            <span class="app-size-36 app-bold">{{ actPrice || ''}}</span>
+            <span class="app-size-36 app-bold">{{ realPrice || '0.00'}}</span>
           </div>
           <div class="order-num app-color-3">订单号: {{ orderSn || ''}}</div>
         </block>
@@ -78,14 +78,14 @@ export default {
       },
       psdKey: '',
       orderSn: '',
-      actPrice: '',
+      realPrice: '',
       _type: '1',
       pageId: ''
     };
   },
   onLoad (options) {
     this.orderSn = options.orderSn;
-    this.actPrice = options.actPrice;
+    this.realPrice = options.realPrice;
     this.type = options.type
   },
   computed: {