shish před 3 roky
rodič
revize
8a80b5912c

+ 1 - 1
ghsApp/src/admin/billing/result.vue

@@ -1,7 +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>
+  <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>

+ 7 - 2
ghsApp/src/pagesArrears/clearResult.vue

@@ -6,6 +6,7 @@
 				<view class="iconfont iconchenggong"></view>
 				<view class="result-title">账单已生成</view>
 				<view class="result-title">客户:{{customName}}</view>
+				<view v-if="hasNoticeCustom == 1" style="margin-bottom:30upx;font-weight:bold;color:#049E2C;font-size:30upx;">【客户已收到新账单提醒】</view>
 				<!-- #ifdef MP-WEIXIN -->
 				<button class="admin-button-com big blue" style="width:45vw;" open-type="share">邀客户结账</button>
 				<!-- #endif -->
@@ -28,7 +29,8 @@ export default {
 	data() {
 		return {
 			title:'点击查账和结账',
-			customName:''
+			customName:'',
+			hasNoticeCustom:0
 		}
 	},
 	onShareAppMessage(res) {
@@ -42,7 +44,7 @@ export default {
 	computed: {
 		...mapGetters({ dictInfo:"getDictionariesInfo" })
 	},
-	onLoad(option) {
+	onLoad() {
 		getCustomDetail(this.option.id).then(res=>{
 			if(res.code == 1){
 				let name = res.data && res.data.ghsShopName ? res.data.ghsShopName : '';
@@ -52,6 +54,9 @@ export default {
 				this.customName = res.data.customName
 			}
 		})
+		if(this.option.hasNoticeCustom){
+			this.hasNoticeCustom = this.option.hasNoticeCustom
+		}
 	},
 	methods: {
 		inviteClear(){

+ 1 - 1
ghsApp/src/pagesArrears/details.vue

@@ -239,7 +239,7 @@ export default {
 						that.pageTo({url:'/admin/clear/customList',type:2})
 					})
 				}else{
-					that.pageTo({url:'/pagesArrears/clearResult',query:{id:res.data.id},type:2})
+					that.pageTo({url:'/pagesArrears/clearResult?id='+res.data.id+'&hasNoticeCustom='+res.data.hasNoticeCustom,type:2})
 				}
 			}
 		}