Merge branch 'zhongqi-itemUpdate'

ghsApp/src/admin/billing/index2.vue

@@ -96,10 +96,10 @@
 						<button class="admin-button-com mini-btn" @click="customData.userPrice=0.01;customData.bigCount=1" style="position:absolute;top:200upx;right:33upx;">赠送</button>
 					</view>
 					<view class="num_bx kind-num_bx" v-if="Number(customData.kind) == 3">
-						<input style="width: 160upx;height:50upx;font-size:28upx;" v-model="kindHoleCount" type="number" placeholder="穴数" @input="calcKindCount" />
-						<text class="kind-unit">穴</text>
-						<input style="width: 160upx;height:50upx;font-size:28upx;" v-model="kindPlateCount" type="number" placeholder="盘数" @input="calcKindCount" />
+						<input style="width: 160upx;height:70upx;font-size:28upx;" v-model="kindPlateCount" type="number" placeholder="盘数" @input="calcKindCount" />
 						<text class="kind-unit">盘</text>
+						<input style="width: 160upx;height:70upx;font-size:28upx;" v-model="kindHoleCount" type="number" placeholder="穴数" @input="calcKindCount" />
+						<text class="kind-unit">穴</text>
 					</view>
 					<view class="num_bx">
 						<input style="width: 280upx;height:50upx;font-size:28upx;" v-model="customData.remark" type="text" placeholder="备注" />

ghsApp/src/admin/custom/selectCustom.vue

@@ -136,11 +136,12 @@ export default {
       }
     },
     init() {
-      if(!this.no_shop_show_model) {
-        this._list();
-      }
+        this._list()
     },
     searchFn(e) {
+        if (this.$util.isEmpty(e)){
+          return false
+        }
         this.resetList();
         this.seekVal = e;
         this._list();

ghsApp/src/admin/custom/visit.vue

@@ -94,9 +94,7 @@ export default {
 	},
   methods: {
     init() {
-      if(!this.no_shop_show_model) {
-        this.getVisit();
-      }
+        this.getVisit()
     },
     searchFn(e) {
       this.resetList();

ghsApp/src/admin/item/components/item2.vue

@@ -218,7 +218,7 @@ export default {
 			color: #333333;
 			overflow: hidden;
 			white-space: nowrap;
-			width: 99%;
+			width: 70%;
 		}
 		.show-color{
 			display:inline-block;

ghsApp/src/admin/item/tree.vue

@@ -56,7 +56,8 @@ export default {
 		return {
 			price: "",
 			numList: {},
-			cellCount: 15,
+			// 每行 5 格，默认 6 行
+			cellCount: 30,
 			stock: 0,
 			unitName: "个"
 		};

ghsApp/src/admin/shop/selectShop.vue

@@ -104,9 +104,7 @@ export default {
       }
     },
     init() {
-      if(!this.no_shop_show_model) {
-        this.getShopList();
-      }
+        this.getShopList()
     },
     searchFn(e) {
         this.resetList();

ghsApp/src/mixins/globalMixins.js

@@ -18,7 +18,6 @@ export default {
 			$util: this.$util,
 			// 全局混入，插入全局跳转函数
       pageTo: pageTo,
-      no_shop_show_model: false,
       shopAdminId: null,
       show_login_model:false,
       //零售店对应的id
@@ -236,8 +235,6 @@ export default {
         //shish 20210615
         uni.removeStorageSync('HOME_REFRESH')
 
-        this.no_shop_show_model = false
-
         getShopInfo(true)
         //获取门店信息
         this.setUserShopAll();

ghsApp/src/pagesOrder/detail.vue

@@ -782,7 +782,9 @@ export default {
 			return dateStr.substr(2, 14)
 		},
 		goTree(item){
-			this.$util.pageTo({url: '/pagesOrder/tree?orderSn='+this.detailInfo.orderSn+'&productId='+item.productId})
+			if(item.kind == 2 || Number(item.dishNum) > 0){
+				this.$util.pageTo({url: '/pagesOrder/tree?orderSn='+this.detailInfo.orderSn+'&productId='+item.productId})
+			}
 		},
 		printTree(item){
 			this.treePrintItem = item

hdApp/src/admin/billing/affirmGhs.vue

@@ -157,6 +157,14 @@
 								<button class="admin-button-com middle" :class="[form.sendType == 3 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:60upx;" @click="changeSendType(3)">物流</button>
 							</tui-list-cell>
 						</block>
+						<block v-else-if="ghsInfo.shopId == 91053">
+							<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
+								<button class="admin-button-com middle" :class="[form.sendType == 1 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:60upx;"  @click="changeSendType(1)">自取</button>
+								<button class="admin-button-com middle" :class="[form.sendType == 0 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;"  @click="changeSendType(0)">送货上门</button>
+								<button class="admin-button-com middle" :class="[form.sendType == 2 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:60upx;" @click="changeSendType(2)">跑腿</button>
+								<button class="admin-button-com middle" :class="[form.sendType == 3 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:60upx;" @click="changeSendType(3)">物流</button>
+							</tui-list-cell>
+						</block>
 						<block v-else-if="ghsInfo.shopId == 36919">
 							<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 								<button class="admin-button-com middle" :class="[form.sendType == 1 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:60upx;"  @click="changeSendType(1)">自取</button>
@@ -1055,10 +1063,14 @@ export default {
 				if(that.ghsInfo.shopId && Number(that.ghsInfo.shopId) == 90985){
 					that.form.sendType = 1
 				}
+				//鼎盛花卉默认自取
 				if(that.ghsInfo.shopId && Number(that.ghsInfo.shopId) == 36919){
 					that.form.sendType = 1
 				}
-
+				//天天鲜花虎门店默认自取
+				if(that.ghsInfo.shopId && Number(that.ghsInfo.shopId) == 91053){
+					that.form.sendType = 1
+				}
 				if(res.data && res.data.shopId == 14636){
 					//花瀚鲜花供应链默认冷链
 					this.changeTransType(2)

hdApp/src/admin/item/components/item2.vue

@@ -211,8 +211,7 @@ export default {
 			color: #333333;
 			overflow: hidden;
 			white-space: nowrap;
-			text-overflow: ellipsis;
-			width:330upx;
+			width: 70%;
 		}
 		.show-color{
 			display:inline-block;

hdApp/src/pagesPurchase/purDetails.vue

@@ -222,6 +222,10 @@
                   <text class="item-count" v-else></text>
                 </view>
               </view>
+							<view class="dish-tag-row" v-if="Number(s.dishNum)>0" @click="goTree(s)">
+								<text class="dish-num" v-if="Number(s.dishNum)>0">{{ s.dishNum }}筛</text>
+								<text class="dish-num" v-else>-</text>
+							</view>
             </view>
           </view>
           <view class="summary-bar">
@@ -694,11 +698,6 @@ export default {
         display: flex;
         align-items: center;
         justify-content: flex-end;
-        & .iconxiangyou {
-          color: #999999;
-          font-size: 25upx;
-          margin-left: 12upx;
-        }
       }
     }
   }
@@ -713,6 +712,7 @@ export default {
       padding: 20upx;
       .commodity-item {
         display: flex;
+        flex-wrap: wrap;
         margin-bottom: 20upx;
         .item-icon {
           flex-shrink: 0;
@@ -734,18 +734,24 @@ export default {
               color: black;
               font-size: 30upx;
               font-weight: 700;
-							overflow: hidden;
-							white-space: nowrap;
-							text-overflow: ellipsis;
-							width:360upx;
+              overflow: hidden;
+              white-space: nowrap;
+              text-overflow: ellipsis;
+              flex: 1;
+              min-width: 0;
             }
             .item-price {
               color: black;
               font-size: 27upx;
-              font-weight:bold;
+              font-weight: bold;
+              flex-shrink: 0;
+              white-space: nowrap;
+              margin-left: 16upx;
+              text-align: right;
               .price {
-                font-size:25upx;
-                font-weight:bold;
+                font-size: 25upx;
+                font-weight: bold;
+                white-space: nowrap;
               }
             }
             .item-type {
@@ -758,6 +764,24 @@ export default {
             }
           }
         }
+        .dish-tag-row {
+          width: 100%;
+          flex: 0 0 100%;
+          margin-top: 12upx;
+          padding: 12upx 16upx;
+          border: 1upx solid #eeeeee;
+          border-radius: 8upx;
+          box-sizing: border-box;
+          background-color: #fafafa;
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
+          .dish-num {
+            color: rgb(156, 150, 150);
+            font-size: 28upx;
+            font-weight: 600;
+          }
+        }
       }
     }
     .summary-bar {
@@ -770,14 +794,9 @@ export default {
       border-top: 1px solid #eeeeee;
       .operate-view {
         display: flex;
-
         align-items: center;
         color: #3385ff;
         font-size: 26upx;
-        .iconfont {
-          margin-right: 20upx;
-          font-size: 40upx;
-        }
       }
       .describe-view {
         display: flex;
@@ -791,28 +810,6 @@ export default {
       }
     }
   }
-  .shipping-address {
-    display: flex;
-    align-items: center;
-    margin-top: 20upx;
-    & > view:nth-child(1) {
-      color: #999999;
-      font-size: 28upx;
-      font-weight: 400;
-      display: inline-block;
-      padding: 30upx 0 30upx 20upx;
-      flex: 1;
-      & > text {
-        color: #333333;
-        font-weight: 600;
-      }
-    }
-    & > view:nth-child(2) {
-      font-size: 60upx;
-      color: #d6e7ff;
-      margin-right: 10upx;
-    }
-  }
   .price-detail {
     margin-top: 20upx;
     margin-bottom: 20upx;
@@ -840,65 +837,5 @@ export default {
   font-weight: 700;
   color: #666;
   padding: 0 20upx;
-  .iconfont {
-    margin-right: 15upx;
-    font-size: 30upx;
-  }
-  & > .editFlr {
-    position: relative;
-    color: #1890f3;
-    font-size: 26upx;
-    &:after {
-      content: "";
-      position: absolute;
-      left: 0;
-      top: 0;
-    }
-  }
-}
-.footer_bar {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  width: 100vw;
-  padding: 15upx 0;
-  // height: 100upx;
-  background: #fff;
-  line-height: 100upx;
-  border-top: 1px solid #ddd;
-  z-index: 10;
-  & > view {
-    float: right;
-    height: 70upx;
-    display: inline-block;
-    padding: 0 50upx;
-    background: #3385ff;
-    margin-right: 20upx;
-    border-radius: 8upx;
-    line-height: 70upx;
-    text-align: center;
-    font-size: 32upx;
-    color: #fff;
-  }
-}
-.distribution {
-  line-height: 80upx;
-  padding: 0 40upx 0 20upx;
-  display: flex;
-  justify-content: space-between;
-  .evolve {
-    position: relative;
-    &::after {
-      content: "";
-      position: absolute;
-      top: 50%;
-      right: -20upx;
-      transform: translateY(-50%) rotate(225deg);
-      width: 10upx;
-      height: 10upx;
-      border-left: 1px solid #ddd;
-      border-bottom: 1px solid #ddd;
-    }
-  }
 }
 </style>

mallApp/src/pages/home/category.vue

@@ -517,12 +517,18 @@ page {
     width: 200upx;
     height: 110upx;
     box-sizing: border-box;
+    padding-left: 3upx;
+    padding-right: 3upx;
     display: flex;
     align-items: center;
     justify-content: center;
     font-size: 28upx;
     color: #444;
     font-weight: 400;
+    text {
+      width: 100%;
+      text-align: center;
+    }
   }
   .active {
     position: relative;