后台新增申请售后功能

去买花去掉了，申请通知功能

采购下单下一页的提示内容有修改

新增 丰行 购买须知

ghsApp/src/admin/shop/add.vue

@@ -153,6 +153,13 @@
 					</view>
 				</tui-list-cell>
 
+				<tui-list-cell class="line-cell" :hover="false">
+					<view class="tui-title">售后申请</view>
+					<view>
+						<switch style="transform:scale(0.7,0.7)" :checked="form.afterSale == 0 ? false : true" @change="afterSaleChange" /> {{form.afterSale==1 ? '允许' : '禁止'}}
+					</view>
+				</tui-list-cell>
+
 				<tui-list-cell class="line-cell" :hover="false">
 					<view class="tui-title">昆明批发</view>
 					<view>
@@ -221,6 +228,7 @@ export default {
 				dataSync:1,
 				showStock:1,
 				showSold:0,
+				afterSale:1,
 				pfLevel:0,
 				isHd:1
 			},
@@ -298,6 +306,9 @@ export default {
 		pfLevelChange(e){
 			this.form.pfLevel = e.target.value ? 1 : 0
 		},
+		afterSaleChange(e){
+			this.form.afterSale = e.target.value ? 1 : 0
+		},
 		showSoldChange(e){
 			this.form.showSold = e.target.value ? 1 : 0
 		},

hdApp/src/admin/billing/affirmGhs.vue

@@ -102,14 +102,14 @@
 				<view style="color:#3385FF;width:100%;font-weight:bold;">请自行查询距离是否符合要求，符合要求再下单哦！</view>
 			</block>
 			<block v-else>
+				<view><text style="color:#3385FF;">首次下单，请联系客服确认您是否在配送范围</text></view>
 				<text style="color: #3385FF;width:100%;" v-if="ghsInfo.shopId && (ghsInfo.shopId == 520 || ghsInfo.shopId == 1489)">
 					在本店配送范围的，下单满100元免费送货上门
 				</text>
 				<text style="color: #3385FF;width:100%;" v-else>在本店配送范围的，免费送货上门</text>
-				<view><text style="color:#3385FF;">首次下单，请联系客服确认您是否在配送范围</text></view>
+				<view><text style="color:red;font-weight:bold">免费配送仅送货到楼下，不支持送货上楼</text></view>
 				<view v-if="ghsInfo.shopId && (ghsInfo.shopId == 520 || ghsInfo.shopId == 1489)"><text style="color:red;font-weight:bold">免费配送每天23:30发车，其它时间请用跑腿或自取</text></view>
-				<view v-if="ghsInfo.shopId && (ghsInfo.shopId == 520 || ghsInfo.shopId == 1489)"><text style="color:red;font-weight:bold">免费配送仅送货到楼下，不支持送货上楼</text></view>
-				<view v-if="ghsInfo.shopId && (ghsInfo.shopId == 520 || ghsInfo.shopId == 1489)"><text style="color:red;font-weight:bold">不在配送范围内的请不要选择送货上门选项，谢谢！</text></view>
+				<view><text style="color:red;font-weight:bold">不在配送范围的，请勿选择【送货上门】选项，否则运费自理</text></view>
 			</block>
 		</view>
 		<view v-if="form.sendType == 1">

hdApp/src/admin/billing/affirmGhsBook.vue

@@ -81,11 +81,11 @@
 
 	<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 		<view v-if="form.sendType == 0">
-			<text style="color: #3385FF;width:100%;">在本店配送范围的，免费送货上门</text>
-			<view><text style="color:red;">首次下单，请联系客服确认是否在配送范围</text></view>
+			<view><text style="color:#3385FF;">首次下单，请联系客服确认您是否在配送范围</text></view>
+			<view><text style="color:#3385FF;">在本店配送范围的，免费送货上门</text></view>
+			<view><text style="color:red;font-weight:bold">免费配送仅送货到楼下，不支持送货上楼</text></view>
 			<view v-if="ghsInfo.shopId && (ghsInfo.shopId == 520 || ghsInfo.shopId == 1489)"><text style="color:red;font-weight:bold">免费配送每天23:30发车，其它时间请用跑腿或自取</text></view>
-			<view v-if="ghsInfo.shopId && (ghsInfo.shopId == 520 || ghsInfo.shopId == 1489)"><text style="color:red;font-weight:bold">免费配送仅送货到楼下，不支持送货上楼</text></view>
-			<view v-if="ghsInfo.shopId && (ghsInfo.shopId == 520 || ghsInfo.shopId == 1489)"><text style="color:red;font-weight:bold">不在配送范围内的请不要选择送货上门选项，谢谢！</text></view>
+			<view><text style="color:red;font-weight:bold">不在配送范围的，请勿选择【送货上门】选项，否则运费自理</text></view>
 		</view>
 		<view v-if="form.sendType == 1">
 			<text style="color: #3385FF;width:100%;">到店自取，没有运费</text>

hdApp/src/admin/home/workbench.vue

@@ -370,28 +370,7 @@ 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.cgSuccess && this.dictInfo.hdMiniMessage.giveCoupon && this.dictInfo.hdMiniMessage.remindHdClear){
-        that.pageTo({url: '/pagesPurchase/ghsProduct?id='+item.id})
-        uni.requestSubscribeMessage({
-          tmplIds: [this.dictInfo.hdMiniMessage.cgSuccess.msgId,this.dictInfo.hdMiniMessage.giveCoupon.msgId,this.dictInfo.hdMiniMessage.remindHdClear.msgId],
-          success(res) {
-            console.log(res)
-          },
-          fail(err) {
-            console.log(err)
-          },
-          complete() {
-
-          }
-        })
-      }else{
-        that.pageTo({url: '/pagesPurchase/ghsProduct?id='+item.id})
-      }
-      // #endif
     },
     settleAccounts (item) {
       this.pageTo({ url: '/pagesPurchase/gathering?id='+item.id})

hdApp/src/pagesPurchase/order.vue

@@ -123,28 +123,7 @@ 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.cgSuccess && this.dictInfo.hdMiniMessage.giveCoupon && this.dictInfo.hdMiniMessage.remindHdClear){
-        that.pageTo({url: '/pagesPurchase/ghsProduct?id='+item.id})
-        uni.requestSubscribeMessage({
-          tmplIds: [this.dictInfo.hdMiniMessage.cgSuccess.msgId,this.dictInfo.hdMiniMessage.giveCoupon.msgId,this.dictInfo.hdMiniMessage.remindHdClear.msgId],
-          success(res) {
-            console.log(res)
-          },
-          fail(err) {
-            console.log(err)
-          },
-          complete() {
-
-          }
-        })
-      }else{
-        that.pageTo({url: '/pagesPurchase/ghsProduct?id='+item.id})
-      }
-      // #endif
     },
     init() {
       this.getGHSList()

hdApp/src/pagesPurchase/purDetails.vue

@@ -272,7 +272,9 @@
         <button class="admin-button-com blue big" @click="toPay">去付款</button>
       </block>
       <block v-else>
+      <block v-if="afterSale == 1">
         <button class="admin-button-com default big" style="margin-right:60upx;" @click="refundOrder" v-if="detailInfo.payStatus == 1">申请售后</button>
+      </block>
         <button class="admin-button-com blue big" @click="clearOrder" v-if="detailInfo.debt == 1">付款结清</button>
       </block>
 
@@ -283,6 +285,7 @@
 import { mapGetters } from "vuex";
 import { purchaseDetail, purchaseDebtPay,purchaseClearCreateOrder } from "@/api/purchase";
 import TuiListCell from "@/components/plugin/list-cell";
+import { getGhsDataApi } from "@/api/ghs";
 export default {
   name: "purDetails",
   components: {
@@ -308,7 +311,8 @@ export default {
       id: '',
       settlePrice:0,
       //登录状态 0未登录 1登录仅用到了采购 2登录用到完整功能
-      loginStyle :0
+      loginStyle :0,
+      afterSale:1
     };
   },
   onShareAppMessage(res) {
@@ -432,11 +436,20 @@ export default {
       this.initData(id)
     },
     initData (id) {
+      let that = this
       return purchaseDetail({ id: id }).then(res => {
         this.detailInfo = res.data
         this.settlePrice = Number(this.detailInfo.bookPrice) - Number(this.detailInfo.orderPrice)
         this.settlePrice = parseFloat(this.settlePrice.toFixed(2))
         this.$forceUpdate()
+
+        let ghsId = res.data.ghsId ? res.data.ghsId : 0
+        getGhsDataApi({id: ghsId}).then(res => {
+          if(res.code == 1){
+            that.afterSale = res.data.afterSale
+          }
+        })
+
       })
     },
     toPay () {

hdApp/src/pagesPurchase/readMe.vue

@@ -43,6 +43,16 @@
 				<image class="image" :src="`${constant.imgUrl}/cg/hyxhxh3.jpg`" mode="widthFix"></image>
 			</view>
 		</view>
+		<view class="list" v-if="shopId == 7855">
+			<view>
+				<view class="title">配送范围：</view>
+			</view>
+			<view>
+				<view class="info">
+                莞城，东城，南城，高埗，万江，道滘，厚街，寮步
+                </view>
+			</view>
+		</view>
 		<view class="list" v-if="shopId == 520 || shopId == 1489">
 			<view>
 				<view class="title">配送范围：</view>