shish 3 år sedan
förälder
incheckning
4f5d8b248d

+ 4 - 2
hdApp/src/admin/billing/affirmGhs.vue

@@ -63,8 +63,10 @@
 
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 						<view v-if="form.sendType == 0">
 						<view v-if="form.sendType == 0">
-							<text style="color: #3385FF;width:100%;">在本店配送范围的,免费送货上门。<text style="color:red;">首次下单,请联系客服确认 </text>是否在配送范围 和 配送时间。</text>
-						</view>				
+							<text style="color: #3385FF;width:100%;">在本店配送范围的,免费送货上门</text>
+							<view><text style="color:red;">首次下单,请联系客服确认是否在配送范围</text></view>
+							<view v-if="ghsInfo.shopId && ghsInfo.shopId == 3"><text style="color:red;font-weight:bold">免费配送固定凌晨0点发车,其它时间请用跑腿或自取</text></view>
+						</view>
 						<view v-if="form.sendType == 1">
 						<view v-if="form.sendType == 1">
 							<text style="color: #3385FF;width:100%;">您自己来店里取,没有配送费</text>
 							<text style="color: #3385FF;width:100%;">您自己来店里取,没有配送费</text>
 						</view>
 						</view>

+ 4 - 2
hdApp/src/admin/billing/affirmGhsBook.vue

@@ -54,8 +54,10 @@
 
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 						<view v-if="form.sendType == 0">
 						<view v-if="form.sendType == 0">
-							<text style="color: #3385FF;width:100%;">在本店配送范围的,免费送货上门。<text style="color:red;">首次下单,请联系客服确认 </text>是否在配送范围 和 配送时间。</text>
-						</view>				
+							<text style="color: #3385FF;width:100%;">在本店配送范围的,免费送货上门</text>
+							<view><text style="color:red;">首次下单,请联系客服确认是否在配送范围</text></view>
+							<view v-if="ghsInfo.shopId && ghsInfo.shopId == 3"><text style="color:red;font-weight:bold">免费配送固定凌晨0点发车,其它时间请用跑腿或自取</text></view>
+						</view>
 						<view v-if="form.sendType == 1">
 						<view v-if="form.sendType == 1">
 							<text style="color: #3385FF;width:100%;">您自己来店里取,没有配送费</text>
 							<text style="color: #3385FF;width:100%;">您自己来店里取,没有配送费</text>
 						</view>
 						</view>

+ 1 - 1
hdApp/src/admin/home/workbench.vue

@@ -176,9 +176,9 @@ export default {
         { name: "制作单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/work/list",pf:1 },
         { name: "制作单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/work/list",pf:1 },
         { name: "改价", img: `${this.$constant.imgUrl}/ghs/home/gj.png`, url: "/admin/changePrice/list",pf:1},
         { name: "改价", img: `${this.$constant.imgUrl}/ghs/home/gj.png`, url: "/admin/changePrice/list",pf:1},
         { name: "花材", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/item/list",pf:1 },
         { name: "花材", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/item/list",pf:1 },
+        { name: "供应商", img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`, url: "/pagesPurchase/order",pf:1 },
         { name: "拆散", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/part/list",pf:1},
         { name: "拆散", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/part/list",pf:1},
         { name: "报损", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/breakage/list",pf:1},
         { name: "报损", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/breakage/list",pf:1},
-        { name: "供应商", img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`, url: "/pagesPurchase/order",pf:1 },
         { name: "花材采购", img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`, url: "/pagesPurchase/shopping",pf:1 },
         { name: "花材采购", img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`, url: "/pagesPurchase/shopping",pf:1 },
         { name: "采购结账", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/clear/list",pf:0 },
         { name: "采购结账", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/clear/list",pf:0 },
         { name: "商品", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/list",pf:1 },
         { name: "商品", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/list",pf:1 },