Merge branch 'zhongqi-delivery' of git.huaml.com:zhh/front-end into zhongqi-delivery

ghsApp/src/admin/delivery/allDelivery.vue

@@ -731,9 +731,27 @@ export default {
   border: 1upx solid #f0f0f0;
   border-top: none;
   flex: 1.5;
-  overflow-y: auto;
+  overflow-y: scroll;
   overflow-x: hidden;
 
+  /* 滚动条样式 */
+  &::-webkit-scrollbar {
+    width: 8upx;
+  }
+
+  &::-webkit-scrollbar-track {
+    background-color: transparent;
+  }
+
+  &::-webkit-scrollbar-thumb {
+    background-color: #d0d0d0;
+    border-radius: 4upx;
+    
+    &:hover {
+      background-color: #b0b0b0;
+    }
+  }
+
   .no-delivery-list {
     padding: 50upx 40upx;
     display: flex;

ghsApp/src/pagesStorehouse/inventory/select.vue

@@ -79,7 +79,7 @@
 						<text style="font-size:35upx;font-weight:bold;color:#666666;" v-if="globalUnitType == 1">支</text>
 						<!-- #endif -->
 
-						<button v-if="selectJobType == 'inventory'" style="position:absolute;top:263upx;left:230upx;" @click="customData.bigCount=99999" class="admin-button-com middle blue">盘点为零</button>
+						<button style="position:absolute;top:263upx;left:230upx;" @click="customData.bigCount=99999" class="admin-button-com middle blue">盘点为零</button>
 
 					</view>
 				</view>
@@ -158,6 +158,11 @@ export default {
 	methods: {
 		pdInit(){
 			let pdType = this.option.pdType ? this.option.pdType: ''
+			//要区分是入库盘点还是普通盘点，不然盘点的花材会混起来
+			if(pdType == 'stockInPd'){
+				this.selectJobType = 'stockInPd'
+			}
+
 			this.initData({ type:'',pdType:pdType,status:0,version:1,requestType:'check'})
 			if(this.option.shopId){
 				this.selectJobId = this.option.shopId

ghsApp/src/pagesStorehouse/inventory/select2.vue

@@ -148,6 +148,13 @@ export default {
 	},
 	methods: {
 		pdInit(){
+
+			let pdType = this.option.pdType ? this.option.pdType: ''
+			//要区分是入库盘点还是普通盘点，不然盘点的花材会混起来
+			if(pdType == 'stockInPd'){
+				this.selectJobType = 'stockInPd'
+			}
+
 			this.globalRequestType = 'check'
 			this.initData()
 			if(this.option.shopId){

ghsApp/src/pagesStorehouse/inventory/update.vue

@@ -96,6 +96,13 @@ export default {
 		};
 	},
 	onLoad(option) {
+
+		let pdType = this.option.pdType ? this.option.pdType: ''
+		//要区分是入库盘点还是普通盘点，不然盘点的花材会混起来
+		if(pdType == 'stockInPd'){
+			this.selectJobType = 'stockInPd'
+		}
+
 		const { orderSn } = option;
 		if (orderSn) {
 			this.orderSn = orderSn;
@@ -111,7 +118,6 @@ export default {
 		if(this.option.shopId){
 			this.selectJobId = this.option.shopId
 		}
-
 	},
 	computed: {
 		...mapGetters(["getMerchantInfo"])

hdApp/src/admin/delivery/allDelivery.vue

@@ -720,9 +720,27 @@ export default {
   border: 1upx solid #f0f0f0;
   border-top: none;
   flex: 1.5;
-  overflow-y: auto;
+  overflow-y: scroll;
   overflow-x: hidden;
 
+  /* 滚动条样式 */
+  &::-webkit-scrollbar {
+    width: 8upx;
+  }
+
+  &::-webkit-scrollbar-track {
+    background-color: transparent;
+  }
+
+  &::-webkit-scrollbar-thumb {
+    background-color: #d0d0d0;
+    border-radius: 4upx;
+    
+    &:hover {
+      background-color: #b0b0b0;
+    }
+  }
+
   .no-delivery-list {
     padding: 50upx 40upx;
     display: flex;

hdApp/src/admin/home/apply.vue

@@ -43,14 +43,14 @@ export default {
             list:[
                 {name: "列表",img: `${this.$constant.hostUrl}/image/ghs/home/hcgl2.png`,url: "/admin/item/list2",pf:1},
                 {name: "分类",img: `${this.$constant.hostUrl}/image/ghs/home/hcgl2.png`,url: "/admin/itemClass/list",pf:1},
-                { name: "盘点", img: `${this.$constant.hostUrl}/image/ghs/home/pandian2.png`, url: "/pagesStorehouse/inventory/list",pf:1},
                 { name: "调拨出库", img: `${this.$constant.hostUrl}/image/ghs/home/dbck2.png`, url: "/pagesStorehouse/allot/allotEx",pf:0},
                 { name: "调拨入库", img: `${this.$constant.hostUrl}/image/ghs/home/dbrk2.png`, url: "/pagesStorehouse/allot/allotPut",pf:0},
                 { name: "库存预警", img: `${this.$constant.hostUrl}/image/ghs/home/kcyjs2.png`, url: "/pagesStorehouse/stockWarn/manage",pf:1},
                 { name: "买花", img: `${this.$constant.hostUrl}/image/ghs/home/icon_ghs2.png`, url: "/pagesPurchase/order",pf:1},
                 { name: "买花记录", img: `${this.$constant.hostUrl}/image/ghs/home/icon_caigou2.png`, url: "/pagesPurchase/shopping",pf:1},
                 { name: "报损", img: `${this.$constant.hostUrl}/image/ghs/home/kcyjs2.png`, url: "/admin/breakage/list",pf:1},
-                { name: "拆散", img: `${this.$constant.hostUrl}/image/ghs/home/kcyjs2.png`, url: "/admin/part/list",pf:1}
+                { name: "拆散", img: `${this.$constant.hostUrl}/image/ghs/home/kcyjs2.png`, url: "/admin/part/list",pf:1},
+                { name: "盘点", img: `${this.$constant.hostUrl}/image/ghs/home/pandian2.png`, url: "/pagesStorehouse/inventory/list",pf:1}
             ]
         },
         {
@@ -64,6 +64,7 @@ export default {
             { name: "会员等级", img: `${this.$constant.hostUrl}/image/ghs/home/shop2.png`, url: "/admin/member/level",pf:1},
             { name: "充值规则", img: `${this.$constant.hostUrl}/image/ghs/home/shop2.png`, url: "/admin/recharge/discount",pf:1},
             { name: "收款码", img: `${this.$constant.hostUrl}/image/ghs/home/shop2.png`, url: "/admin/cg/code",pf:1},
+            { name: "收款流水", img: `${this.$constant.hostUrl}/image/ghs/home/kcyjs2.png`, url: "/admin/order/scanPay",pf:1},
             { name: "已删商家", img: `${this.$constant.hostUrl}/image/ghs/home/icon_ghs2.png`, url: "/pagesPurchase/pb",pf:1}
           ]
         },

hdApp/src/pagesPurchase/contact.vue

@@ -22,7 +22,7 @@
     </view>
 
     <view style="font-size:40upx;margin-top:40upx;font-weight:bold;color: red;">
-    零售想做批发的 和 斗南批发商，请勿联系我们，系统做不起来，不要浪费时间浪费钱，请勿扰！勿扰！勿扰！打电话过来就挨骂！！！
+    零售想做批发的 和 斗南批发商，请勿联系我们，系统做不起来，不要浪费时间浪费钱，勿扰！勿扰！勿扰！打电话过来就挨骂！！
     </view>
     <view style="font-size:40upx;margin-top:40upx;font-weight:bold;color:green;margin-bottom:10upx;">
     城市批发店，如需要申请使用商城和系统，请电话联系我们：15280215347

mallApp/src/pages/goods/detail.vue

@@ -327,33 +327,6 @@ export default {
       });
     },
     showPopup() {
-      const currentShop = uni.getStorageSync('currentShop');
-
-      if (this.$util.isEmpty(currentShop)) {
-        console.error("当前所在门店数据异常");
-      } else if (currentShop.openStartTime !='' && currentShop.openEndTime !='') {
-        // 当前小时与分钟是否在营业时间范围内
-        const currentTime = new Date();
-        const currentHour = currentTime.getHours();
-        const currentMinute = currentTime.getMinutes();
-
-        const openTime = currentShop.openStartTime; //营业开始时间，例如：3:30
-        const openHour = parseInt(openTime.split(':')[0]);
-        const openMinute = parseInt(openTime.split(':')[1]);
-        const closeTime = currentShop.openEndTime; //营业结束时间，例如：18:30
-        const closeHour = parseInt(closeTime.split(':')[0]);
-        const closeMinute = parseInt(closeTime.split(':')[1]);
-
-        if (currentHour < openHour || (currentHour === openHour && currentMinute < openMinute)) {
-          this.$msg("已休店");
-          return;
-        }
-        if (currentHour > closeHour || (currentHour === closeHour && currentMinute > closeMinute)) {
-          this.$msg("已休店");
-          return;
-        }
-      }
-
       this.popupShow = true;
     },
     hidePopup() {

mallApp/src/pages/home/recent.vue

@@ -155,10 +155,10 @@
 
             <!-- 操作按钮组 -->
             <view class="action-buttons">
-              <view class="action-btn secondary" @click.stop="bug(item)">
+              <view class="action-btn secondary" :class="{ disabled: item.openShop === 0 }" @click.stop="bug(item)">
                 <text class="btn-text">🌸 花材</text>
               </view>
-              <view class="action-btn secondary" @click.stop="hs(item)">
+              <view class="action-btn secondary" :class="{ disabled: item.openShop === 0 }" @click.stop="hs(item)">
                 <text class="btn-text">💐 绿植花束</text>
               </view>
             </view>
@@ -300,12 +300,18 @@ export default {
       });
     },
     bug(item) {
+      if(item.openShop == 0){
+        this.$msg('已休店')
+        return
+      }
       this.pageTo({ url: "/pages/item/item?account=" + item.shopId + "&hdId=" + item.id, })
     },
     hs(item) {
-      this.pageTo({
-        url: "/pages/home/category?id=" + item.id + "&account=" + item.shopId,
-      });
+      if(item.openShop == 0){
+        this.$msg('已休店')
+        return
+      }
+      this.pageTo({ url: "/pages/home/category?id=" + item.id + "&account=" + item.shopId, })
     },
     tj(item) {
       this.pageTo({
@@ -837,6 +843,13 @@ page {
       &.secondary {
         background: linear-gradient(135deg, #ff6b6b 0%, #ee5a24 100%);
         flex: 1.1;
+
+        &.disabled {
+          background: linear-gradient(135deg, #ccc 0%, #999 100%);
+          opacity: 0.6;
+          box-shadow: none;
+          pointer-events: none;
+        }
       }
 
       &.tertiary {

mallApp/src/pages/item/item.vue

@@ -470,32 +470,6 @@ export default {
 		},
 		confirmSelectEvent() {
 			if (this.selectList.length > 0) {
-				const currentShop = uni.getStorageSync('currentShop');
-				if (this.$util.isEmpty(currentShop)) {
-					console.error("当前所在门店数据异常");
-				} else if (currentShop.openStartTime !='' && currentShop.openEndTime !='') {
-					// 当前小时与分钟是否在营业时间范围内
-					const currentTime = new Date();
-					const currentHour = currentTime.getHours();
-					const currentMinute = currentTime.getMinutes();
-
-					const openTime = currentShop.openStartTime; //营业开始时间，例如：3:30
-					const openHour = parseInt(openTime.split(':')[0]);
-					const openMinute = parseInt(openTime.split(':')[1]);
-					const closeTime = currentShop.openEndTime; //营业结束时间，例如：18:30
-					const closeHour = parseInt(closeTime.split(':')[0]);
-					const closeMinute = parseInt(closeTime.split(':')[1]);
-
-					if (currentHour < openHour || (currentHour === openHour && currentMinute < openMinute)) {
-						this.$msg("已休店");
-						return;
-					}
-					if (currentHour > closeHour || (currentHour === closeHour && currentMinute > closeMinute)) {
-						this.$msg("已休店");
-						return;
-					}
-				}
-
 				//因历史遗留原因，打开花材页马上点花材出现数量0或null的情况，需要过滤 shish 20210716
 				let selectList = this.selectList;
 				let list = [];

mallApp/src/pages/order/buy.vue

@@ -197,7 +197,9 @@ export default {
       this.form.sendCost = this.freightPrice
     },
     formSubmit() {
-      this.createOrderFn()
+			this.$util.confirmModal({content:'确认提交'},() => {
+			  this.createOrderFn()	
+			})
     },
     createOrderFn() {
       let hdId = this.option.hdId?this.option.hdId:0

mallApp/src/pages/order/components/app-delivery.vue

@@ -70,11 +70,9 @@
           <tui-list-cell class="line-cell" :hover="false">
               <view class="tui-title">跑腿费</view>
               <view class="tui-input">
-                <text :class="isFreeDelivery ? 'delivery-price-free' : 'delivery-price-normal'">¥{{ form.sendCost }}</text>
-                <text v-if="isFreeDelivery" class="free-delivery-tag">¥0【免跑腿费】</text>
-                <text v-if="showDeliveryPolicy" class="delivery-policy-link" @click="showDeliveryPolicyModal">
-									<text class="iconfont iconchangjianwentixiangguanwenti2 policy-icon"></text>包配送政策
-								</text>
+                <text :class="isFreeDelivery ? 'delivery-price-free' : 'delivery-price-normal'" v-if="Number(form.sendCost)>0">¥{{ form.sendCost }}</text>
+                <text v-if="isFreeDelivery" class="free-delivery-tag">¥0</text>
+                <text v-if="showDeliveryPolicy" class="delivery-policy-link" @click="showDeliveryPolicyModal">免费配送范围</text>
               </view>
           </tui-list-cell>
           
@@ -1056,7 +1054,7 @@ export default {
 .delivery-policy-link {
 	color: rgb(201, 52, 52);
 	font-size: 32upx;
-	margin-left:10upx;
+	margin-left:25upx;
   font-weight:bold;
 	text-decoration: underline;
 }