shish 3 yıl önce
ebeveyn
işleme
e3a7f342f4

+ 13 - 12
ghsApp/src/admin/billing/result.vue

@@ -1,6 +1,7 @@
 <template>
 
 <appResult :title="option.title">
+  <view v-if="detailInfo.hasNoticeCustom && detailInfo.hasNoticeCustom == 1" style="margin-bottom:30upx;font-weight:bold;color:#049E2C;font-size:30upx;">客户已收到新订单提醒^_^</view>
   <!-- #ifdef MP-WEIXIN -->
   <button v-if="option.title != '报损成功'" class="admin-button-com big blue" open-type="share">
     分享给<text style="font-weight:bold;margin-left:12upx;">{{customName}}</text>
@@ -14,7 +15,7 @@
 	<button v-if="option.title != '报损成功'" class="admin-button-com big" @click="gotoOrderDetail">订单详情</button>
   <button v-if="option.title != '报损成功'" class="admin-button-com big" @click="printOrder()">打印(无价格)</button>
 	<button class="admin-button-com big" @click="goBackHome">返回首页</button>
-  <view>
+  <view style="margin-top:20upx;">
     <block v-for="(item, index) in detailInfo.product" :key="index">
       <view style="text-align:center;margin-bottom:10upx;">
         <text style="font-size:30upx;">
@@ -27,17 +28,17 @@
     </block>
   </view>
 
-		<modal-module :show="givePopShow" @click="confirmGive" :maskClosable="true" title="数量" padding="30rpx 30rpx" >
-		<template v-slot:content>
-			<div class="app-modal-input-wrap">
-			<div class="inp-list-line">
-				<div class="line-input">
-				<input type="number" ref="input" style="width:61.8%;text-align:center;" v-model="giveNum" :adjust-position="false" class="inp-input" @focus="giveNum=''" />
-				</div>
-			</div>
-			</div>
-		</template>
-		</modal-module>
+  <modal-module :show="givePopShow" @click="confirmGive" :maskClosable="true" title="数量" padding="30rpx 30rpx" >
+  <template v-slot:content>
+    <div class="app-modal-input-wrap">
+    <div class="inp-list-line">
+      <div class="line-input">
+      <input type="number" ref="input" style="width:61.8%;text-align:center;" v-model="giveNum" :adjust-position="false" class="inp-input" @focus="giveNum=''" />
+      </div>
+    </div>
+    </div>
+  </template>
+  </modal-module>
 
 </appResult>
 

+ 5 - 0
hdApp/src/admin/home/workbench.vue

@@ -369,6 +369,10 @@ export default {
         this.$msg('已休店,请选择其它门店')
         return false
       }
+      // #ifdef APP-PLUS
+      that.pageTo({url: '/pagesPurchase/ghsProduct?id='+item.id})
+      // #endif
+      // #ifdef MP-WEIXIN
       if(this.dictInfo && this.dictInfo.subscribeMessage && this.dictInfo.subscribeMessage == 1 && this.dictInfo.hdMiniMessage && this.dictInfo.hdMiniMessage.giveCoupon && this.dictInfo.hdMiniMessage.remindHdClear){
         uni.requestSubscribeMessage({
           tmplIds: [this.dictInfo.hdMiniMessage.giveCoupon.msgId,this.dictInfo.hdMiniMessage.cgSuccess.msgId,this.dictInfo.hdMiniMessage.remindHdClear.msgId],
@@ -385,6 +389,7 @@ export default {
       }else{
         that.pageTo({url: '/pagesPurchase/ghsProduct?id='+item.id})
       }
+      // #endif
     },
     settleAccounts (item) {
       this.pageTo({ url: '/pagesPurchase/gathering?id='+item.id})

+ 5 - 0
hdApp/src/pagesPurchase/order.vue

@@ -123,6 +123,10 @@ export default {
         that.$msg('已休店,请选择其它门店')
         return false
       }
+      // #ifdef APP-PLUS
+      that.pageTo({url: '/pagesPurchase/ghsProduct?id='+item.id})
+      // #endif
+      // #ifdef MP-WEIXIN
       if(this.dictInfo && this.dictInfo.subscribeMessage && this.dictInfo.subscribeMessage == 1 && this.dictInfo.hdMiniMessage && this.dictInfo.hdMiniMessage.giveCoupon && this.dictInfo.hdMiniMessage.remindHdClear){
         uni.requestSubscribeMessage({
           tmplIds: [this.dictInfo.hdMiniMessage.giveCoupon.msgId,this.dictInfo.hdMiniMessage.cgSuccess.msgId,this.dictInfo.hdMiniMessage.remindHdClear.msgId],
@@ -139,6 +143,7 @@ export default {
       }else{
         that.pageTo({url: '/pagesPurchase/ghsProduct?id='+item.id})
       }
+      // #endif
     },
     init() {
       this.getGHSList()