基础应用修改

app.js

@@ -48,8 +48,6 @@ App({
 		http: new ApiModel, //挂载接口文件
 		queryPer: require("./utils/queryPermissions"), //权限查询
 		handleSelect: null, //处理选择结果函数
-		collectCount: "", //购物车商品数量
-		getCollectCount: null, // 获取购物车数量
 		socketEstablish: false, //是否已经建立socket
 		SocketTask: '', // Socket方法
 		remindchangepassword_str: "",

packageA/activity/detail.js

@@ -56,7 +56,7 @@ Page({
 			pageTotal = this.data.pageTotal;
 		if (pageNumber > pageTotal) return;
 		_Http.basic({
-			"id": 20230116094803,
+			"id": 20231025144103,
 			"version": 1,
 			"content": {
 				sa_promotionid: this.data.sa_promotionid,
@@ -165,7 +165,7 @@ Page({
 	clickBut() {
 		wx.navigateTo({
 			url: '/packageA/activity/selectProduct/index?params=' + JSON.stringify({
-				"id": 20230116094803,
+				"id": 20231025144103,
 				"version": 1,
 				"content": {
 					nocache: true,

packageA/activity/index.js

@@ -29,7 +29,7 @@ Page({
 		if (init) content.pageNumber = 1;
 		if (content.pageNumber > content.pageTotal) return;
 		_Http.basic({
-			"id": 20220103140003,
+			"id": 20231025144003,
 			content
 		}).then(res => {
 			console.log("活动列表", res)

packageA/activity/selectProduct/cart/index.js

@@ -150,7 +150,6 @@ Page({
 							title: res.msg,
 							icon: "none"
 						});
-						getApp().globalData.getCollectCount()
 						wx.showModal({
 							title: '提示',
 							content: '生成成功!是否立即前往',
@@ -299,7 +298,6 @@ Page({
 					});
 					if (res.msg != '成功') return;
 					this.getList(true)
-					getApp().globalData.getCollectCount()
 				})
 			}
 		})

packageA/activity/selectProduct/index.js

@@ -34,22 +34,6 @@ Page({
     this.getList()
     getApp().globalData.customizedProduct = this.customizedProduct.bind(this);
   },
-  onShow() {
-    this.getCollectCount()
-  },
-  getCollectCount() {
-    return _Http.basic({
-      "id": 20220927093202,
-      "content": {
-        sa_promotionid: this.data.params.content.sa_promotionid
-      }
-    }).then(res => {
-      console.log("促销购物车数量", res.data)
-      this.selectComponent("#Footer").setData({
-        badge: res.data.num || 0
-      })
-    });
-  },
   updateCart({
     detail
   }) {
@@ -94,7 +78,6 @@ Page({
             result: [],
             resultList: [],
           })
-          this.getCollectCount();
         }
       })
     }

packageA/dispatchBill/rows.js

@@ -23,7 +23,7 @@ Page({
     if (content.pageNumber > content.pageTotal) return;
     this.setListHeight();
     _Http.basic({
-      "id": 20230508113003,
+      "id": 20231030091403,
       content
     }).then(res => {
       console.log("发货列表", res)

packageA/market/detail.js

@@ -9,7 +9,6 @@ import currency from "../../utils/currency";
 Page({
 	data: {
 		hidePrice: wx.getStorageSync('hidePrice'),
-		badge: getApp().globalData.collectCount,
 		loading: true,
 		content: {
 			sa_itemgroupid: null,
@@ -209,13 +208,6 @@ Page({
 			content
 		})
 	},
-	clickBut() {
-		this.data.detail.tradefield.length >= 2 ? wx.showToast({
-			title: '请选择加入产品领域',
-			icon: "none",
-			duration: 3000
-		}) : this.handleStorage(0);
-	},
 	/* 打开文档 */
 	openDocument(e) {
 		const {
@@ -258,50 +250,4 @@ Page({
 			}
 		})
 	},
-	/* 选择领域 */
-	storage(e) {
-		this.handleStorage(e.detail.value)
-	},
-	handleStorage(index) {
-		let detail = this.data.detail,
-			content = this.data.content;
-		if (detail.iscustomsize == 1) {
-			if (detail.widthschemeid != 0 && content.dwidth == 0) return wx.showToast({
-				title: '请完成定制宽选项',
-				icon: "none"
-			})
-			if (detail.lengthschemeid != 0 && content.dlength == 0) return wx.showToast({
-				title: '请完成定制长选项',
-				icon: "none"
-			})
-		}
-		_Http.basic({
-			"id": 20220924095102,
-			"content": {
-				sa_brandid,
-				"itemid": detail.itemid, //货品id
-				"qty": detail.orderminqty, //数量
-				itemno: detail.itemno, //货品编号
-				tradefield: detail.tradefield[index].tradefield,
-				width: content.dwidth,
-				length: content.dlength
-			},
-		}).then(res => {
-			console.log("加入购物车", res)
-			wx.showToast({
-				title: res.msg == '成功' ? '加入成功' : res.msg,
-				icon: "none"
-			});
-			if (res.msg == '成功') getApp().globalData.getCollectCount().then(badge => this.setData({
-				badge
-			}))
-		})
-	},
-	/* 前往购物车 */
-	toCollect(e) {
-		getApp().globalData.changeBar({
-			detail: "Collect"
-		})
-		wx.navigateBack();
-	}
 })

packageA/market/detail.skeleton.wxml

@@ -1,14 +1,14 @@
 <!--
-此文件为开发者工具生成，生成时间: 2022/12/23下午4:01:20
+此文件为开发者工具生成，生成时间: 2023/10/30下午1:29:29
 使用方法：
-在 E:\云链项目\e-wechat\packageA\market\detail.wxml 引入模板
+在 D:\开发项目\区域经理端E订单\packageA\market\detail.wxml 引入模板
 
 ```
 <import src="detail.skeleton.wxml"/>
 <template is="skeleton" wx:if="{{loading}}" />
 ```
 
-在 E:\云链项目\e-wechat\packageA\market\detail.wxss 中引入样式
+在 D:\开发项目\区域经理端E订单\packageA\market\detail.wxss 中引入样式
 ```
 @import "./detail.skeleton.wxss";
 ```
@@ -18,98 +18,76 @@
 <template name="skeleton">
   <view class="sk-container">
     <swiper circular="true" indicator-dots="true" indicator-active-color="#333" current="0" autoplay="false">
-      <swiper-item style="position: absolute; width: 100%; height: 100%; transform: translate(0%, 0px) translateZ(0px);">
+      <swiper-item data-index="0" data-type="image" style="position: absolute; width: 100%; height: 100%; transform: translate(0%, 0px) translateZ(0px);">
         <view is="miniprogram_npm/@vant/weapp/image/index">
-          <view class=" van-image image-index--van-image" style="width:100vw;height:232px">
-            <image class="van-image__img image-index--van-image__img sk-image" mode="aspectFill" lazy-load="true"></image>
+          <view class=" van-image image-index--van-image" style="width:100vw;height:241px">
+            <image class="van-image__img image-index--van-image__img sk-image" mode="aspectFit" lazy-load="true"></image>
           </view>
         </view>
       </swiper-item>
     </swiper>
     <view class="intr">
-      <view class="title sk-transparent sk-text-14-2857-745 sk-text">
-        是的防守打法adfaouqowidkjasfhioaushfauifdf23405982日维护及or和93亖2噢4好3423423423sefsdfsaf发文安慰3千3
+      <view class="title sk-transparent">
+        纤维大板帝王世家（2.8米）
+        <view is="miniprogram_npm/@vant/weapp/tag/index">
+          <view class=" van-tag tag-index--van-tag van-tag--warning tag-index--van-tag--warning" style="true"></view>
+        </view>
       </view>
       <view class="tags">
-        <text class="sk-transparent sk-text-22-2222-319 sk-text">班尼戈</text>
-        <text class="sk-transparent sk-text-22-2222-238 sk-text">水务</text>
+        <text class="sk-transparent sk-text-22-2222-997 sk-text">来斯奥</text>
+        <text class="sk-transparent sk-text-22-2222-637 sk-text">建材家居</text>
       </view>
       <view class="offer">
         <view>
-          <text class="price sk-transparent sk-text-14-2857-491 sk-text">￥2587.12</text>
-          <text class="old-price sk-transparent sk-text-14-2857-814 sk-text" style="text-decoration-color: transparent;">￥3587.12</text>
+          <text class="price sk-transparent sk-text-14-2857-208 sk-text">￥409.89</text>
         </view>
-        <text class="unit sk-transparent sk-text-14-2857-438 sk-text">单位/根</text>
+        <text class="unit sk-transparent sk-text-14-2857-404 sk-text">单位/片</text>
       </view>
       <view class="else">
-        <text class="sk-transparent sk-text-14-7059-887 sk-text">起订量:10</text>
-        <text class="sk-transparent sk-text-14-7059-57 sk-text">库存:1200 紧缺</text>
+        <text class="sk-transparent sk-text-14-7059-360 sk-text">起订量：1</text>
+        <text class="sk-transparent sk-text-14-7059-926 sk-text">增量：1</text>
+        <text class="sk-transparent sk-text-14-7059-882 sk-text">包装数量:1</text>
       </view>
     </view>
     <view class="model">
-      <view class="label sk-transparent sk-text-34-4444-172 sk-text">
-        选择商品
+      <view class="label sk-transparent sk-text-14-2857-328 sk-text">
+        基材
       </view>
       <view class="product-box">
-        <navigator class="product active sk-transparent sk-text-26-6667-752 sk-text">22X1.2mmX2.50</navigator>
-        <navigator class="product sk-transparent sk-text-26-6667-108 sk-text">22X1.2mmX2.51</navigator>
-        <navigator class="product sk-transparent sk-text-26-6667-361 sk-text">22X1.2mmX2.52</navigator>
-        <navigator class="product sk-transparent sk-text-26-6667-445 sk-text">22X1.2mmX2.53</navigator>
-        <navigator class="product sk-transparent sk-text-26-6667-283 sk-text">22X1.2mmX2.54</navigator>
+        <navigator class="product active sk-transparent sk-text-27-4194-980 sk-text" data-value="[object Object]" data-valuename="material">纤维大板</navigator>
+        <navigator class="product disabled sk-transparent sk-text-27-4194-114 sk-text" data-value="[object Object]" data-valuename="material">双层蜂香板</navigator>
+        <navigator class="product disabled sk-transparent sk-text-27-4194-532 sk-text" data-value="[object Object]" data-valuename="material">单层蜂香板</navigator>
+        <navigator class="product disabled sk-transparent sk-text-27-4194-948 sk-text" data-value="[object Object]" data-valuename="material">U+880</navigator>
+        <navigator class="product disabled sk-transparent sk-text-27-4194-206 sk-text" data-value="[object Object]" data-valuename="material">A+600公母槽</navigator>
       </view>
-    </view>
-    <view is="miniprogram_npm/@vant/weapp/tabs/index">
-      <view class="tabs van-tabs tabs-index--van-tabs van-tabs--line tabs-index--van-tabs--line">
-        <view is="miniprogram_npm/@vant/weapp/sticky/index">
-          <view class=" van-sticky sticky-index--van-sticky" style="z-index:1">
-            <view class="van-sticky-wrap sticky-index--van-sticky-wrap" style="z-index:1">
-              <view class="van-tabs__wrap tabs-index--van-tabs__wrap ">
-                <scroll-view class="van-tabs__scroll tabs-index--van-tabs__scroll van-tabs__scroll--line tabs-index--van-tabs__scroll--line" scroll-left="0" style="border-color: var(--assist)">
-                  <view class="van-tabs__nav tabs-index--van-tabs__nav van-tabs__nav--line tabs-index--van-tabs__nav--line " style="true">
-                    <view class="van-tabs__line tabs-index--van-tabs__line" style="width:40px;opacity:1;transform:translateX(73.83333587646484px);-webkit-transform:translateX(73.83333587646484px);background-color:var(--assist);transition-duration:0.3s;-webkit-transition-duration:0.3s"></view>
-                    <view class="  van-ellipsis tabs-index--van-ellipsis van-tab tabs-index--van-tab van-tab--active tabs-index--van-tab--active" data-index="0" style="color:var(--assist)">
-                      <view class="van-ellipsis tabs-index--van-ellipsis sk-transparent sk-text-34-0909-657 sk-text" style="background-position-x: 50%;">
-                        商品简介
-                      </view>
-                    </view>
-                    <view class=" van-ellipsis tabs-index--van-ellipsis van-tab tabs-index--van-tab" data-index="1" style="true">
-                      <view class="van-ellipsis tabs-index--van-ellipsis sk-transparent sk-text-34-0909-954 sk-text" style="background-position-x: 50%;">
-                        产品资料
-                      </view>
-                    </view>
-                  </view>
-                </scroll-view>
-              </view>
-            </view>
-          </view>
-        </view>
-        <view class="van-tabs__content tabs-index--van-tabs__content">
-          <view class="van-tabs__track tabs-index--van-tabs__track van-tabs__track tabs-index--van-tabs__track" style="true">
-            <view is="miniprogram_npm/@vant/weapp/tab/index">
-              <view class=" van-tab__pane tab-index--van-tab__pane van-tab__pane--active tab-index--van-tab__pane--active" style="true">
-                <view class="tab-box">
-                  <view class="row sk-transparent sk-text-15-0000-737 sk-text">
-                    商品编号：CMCULP 0220001
-                  </view>
-                  <view class="row sk-transparent sk-text-15-0000-573 sk-text">
-                    规格：22x1.2mmx2.5
-                  </view>
-                  <view class="row sk-transparent sk-text-15-0000-780 sk-text">
-                    型号：—
-                  </view>
-                </view>
-              </view>
-            </view>
-          </view>
-        </view>
+      <view class="label sk-transparent sk-text-14-2857-338 sk-text">
+        颜色
       </view>
-    </view>
-    <view class="footer">
-      <view is="miniprogram_npm/@vant/weapp/button/index">
-        <button app-parameter="true" business-id="true" class="but van-button button-index--van-button van-button--default button-index--van-button--default van-button--normal button-index--van-button--normal sk-button sk-pseudo sk-pseudo-circle" data-detail="null"
-          form-type="true" hover-class="van-button--active hover-class" lang="true" open-type="true" send-message-img="true" send-message-path="true" send-message-title="true" session-from="true" style="true">
-          <view class="van-button__text button-index--van-button__text sk-transparent sk-text-15-0000-518 sk-text" style="background-position-x: 50%;">加入购物车</view>
-        </button>
+      <view class="product-box">
+        <navigator class="product sk-transparent sk-text-27-4194-672 sk-text" data-value="[object Object]" data-valuename="color">黑金乔木</navigator>
+        <navigator class="product sk-transparent sk-text-27-4194-101 sk-text" data-value="[object Object]" data-valuename="color">莱茵白</navigator>
+        <navigator class="product sk-transparent sk-text-27-4194-301 sk-text" data-value="[object Object]" data-valuename="color">花火菲丝古</navigator>
+        <navigator class="product sk-transparent sk-text-27-4194-654 sk-text" data-value="[object Object]" data-valuename="color">花梨木</navigator>
+        <navigator class="product sk-transparent sk-text-27-4194-118 sk-text" data-value="[object Object]" data-valuename="color">深棕木</navigator>
+        <navigator class="product sk-transparent sk-text-27-4194-737 sk-text" data-value="[object Object]" data-valuename="color">浅棕木</navigator>
+        <navigator class="product sk-transparent sk-text-27-4194-290 sk-text" data-value="[object Object]" data-valuename="color">法国榉木</navigator>
+        <navigator class="product sk-transparent sk-text-27-4194-849 sk-text" data-value="[object Object]" data-valuename="color">欧派特丽</navigator>
+        <navigator class="product active sk-transparent sk-text-27-4194-738 sk-text" data-value="[object Object]" data-valuename="color">帝王世家</navigator>
+        <navigator class="product sk-transparent sk-text-27-4194-24 sk-text" data-value="[object Object]" data-valuename="color">巴西黄檀</navigator>
+        <navigator class="product sk-transparent sk-text-27-4194-729 sk-text" data-value="[object Object]" data-valuename="color">丽芙柚木</navigator>
+      </view>
+      <view class="label sk-transparent sk-text-14-2857-319 sk-text">
+        尺寸
+      </view>
+      <view class="product-box">
+        <navigator class="product sk-transparent sk-text-27-4194-606 sk-text" data-value="[object Object]" data-valuename="spec">1200×2440</navigator>
+        <navigator class="product active sk-transparent sk-text-27-4194-589 sk-text" data-value="[object Object]" data-valuename="spec">1200×2800</navigator>
+        <navigator class="product disabled sk-transparent sk-text-27-4194-778 sk-text" data-value="[object Object]" data-valuename="spec">585×2600</navigator>
+        <navigator class="product disabled sk-transparent sk-text-27-4194-307 sk-text" data-value="[object Object]" data-valuename="spec">600×2600</navigator>
+        <navigator class="product disabled sk-transparent sk-text-27-4194-988 sk-text" data-value="[object Object]" data-valuename="spec">600×2800</navigator>
+        <navigator class="product disabled sk-transparent sk-text-27-4194-724 sk-text" data-value="[object Object]" data-valuename="spec">600×3000</navigator>
+        <navigator class="product disabled" data-value="[object Object]" data-valuename="spec"></navigator>
+        <navigator class="product disabled" data-value="[object Object]" data-valuename="spec"></navigator>
       </view>
     </view>
   </view>

packageA/market/detail.skeleton.wxss

@@ -1,7 +1,7 @@
 /*
-此文件为开发者工具生成，生成时间: 2022/12/23下午4:01:20
+此文件为开发者工具生成，生成时间: 2023/10/30下午1:29:29
 
-在 E:\云链项目\e-wechat\packageA\market\detail.wxss 中引入样式
+在 D:\开发项目\区域经理端E订单\packageA\market\detail.wxss 中引入样式
 ```
 @import "./detail.skeleton.wxss";
 ```
@@ -11,9 +11,9 @@
 .sk-transparent {
     color: transparent !important;
   }
-.sk-text-14-2857-745 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 42.0000rpx;
+.sk-text-22-2222-997 {
+    background-image: linear-gradient(transparent 22.2222%, #EEEEEE 0%, #EEEEEE 77.7778%, transparent 0%) !important;
+    background-size: 100% 34.6154rpx;
     position: relative !important;
   }
 .sk-text {
@@ -23,122 +23,164 @@
     color: transparent !important;
     background-repeat: repeat-y !important;
   }
-.sk-text-22-2222-319 {
+.sk-text-22-2222-637 {
     background-image: linear-gradient(transparent 22.2222%, #EEEEEE 0%, #EEEEEE 77.7778%, transparent 0%) !important;
-    background-size: 100% 36.0000rpx;
+    background-size: 100% 34.6154rpx;
     position: relative !important;
   }
-.sk-text-22-2222-238 {
-    background-image: linear-gradient(transparent 22.2222%, #EEEEEE 0%, #EEEEEE 77.7778%, transparent 0%) !important;
-    background-size: 100% 36.0000rpx;
+.sk-text-14-2857-208 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 48.4615rpx;
     position: relative !important;
   }
-.sk-text-14-2857-491 {
+.sk-text-14-2857-404 {
     background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 50.4000rpx;
+    background-size: 100% 32.3077rpx;
     position: relative !important;
   }
-.sk-text-14-2857-814 {
+.sk-text-14-7059-360 {
+    background-image: linear-gradient(transparent 14.7059%, #EEEEEE 0%, #EEEEEE 85.2941%, transparent 0%) !important;
+    background-size: 100% 32.6923rpx;
+    position: relative !important;
+  }
+.sk-text-14-7059-926 {
+    background-image: linear-gradient(transparent 14.7059%, #EEEEEE 0%, #EEEEEE 85.2941%, transparent 0%) !important;
+    background-size: 100% 32.6923rpx;
+    position: relative !important;
+  }
+.sk-text-14-7059-882 {
+    background-image: linear-gradient(transparent 14.7059%, #EEEEEE 0%, #EEEEEE 85.2941%, transparent 0%) !important;
+    background-size: 100% 32.6923rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-328 {
     background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 39.2000rpx;
+    background-size: 100% 37.6923rpx;
+    position: relative !important;
+  }
+.sk-text-27-4194-980 {
+    background-image: linear-gradient(transparent 27.4194%, #EEEEEE 0%, #EEEEEE 72.5806%, transparent 0%) !important;
+    background-size: 100% 59.6154rpx;
+    position: relative !important;
+  }
+.sk-text-27-4194-114 {
+    background-image: linear-gradient(transparent 27.4194%, #EEEEEE 0%, #EEEEEE 72.5806%, transparent 0%) !important;
+    background-size: 100% 59.6154rpx;
     position: relative !important;
   }
-.sk-text-14-2857-438 {
+.sk-text-27-4194-532 {
+    background-image: linear-gradient(transparent 27.4194%, #EEEEEE 0%, #EEEEEE 72.5806%, transparent 0%) !important;
+    background-size: 100% 59.6154rpx;
+    position: relative !important;
+  }
+.sk-text-27-4194-948 {
+    background-image: linear-gradient(transparent 27.4194%, #EEEEEE 0%, #EEEEEE 72.5806%, transparent 0%) !important;
+    background-size: 100% 59.6154rpx;
+    position: relative !important;
+  }
+.sk-text-27-4194-206 {
+    background-image: linear-gradient(transparent 27.4194%, #EEEEEE 0%, #EEEEEE 72.5806%, transparent 0%) !important;
+    background-size: 100% 59.6154rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-338 {
     background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 33.6000rpx;
+    background-size: 100% 37.6923rpx;
     position: relative !important;
   }
-.sk-text-14-7059-887 {
-    background-image: linear-gradient(transparent 14.7059%, #EEEEEE 0%, #EEEEEE 85.2941%, transparent 0%) !important;
-    background-size: 100% 34.0000rpx;
+.sk-text-27-4194-672 {
+    background-image: linear-gradient(transparent 27.4194%, #EEEEEE 0%, #EEEEEE 72.5806%, transparent 0%) !important;
+    background-size: 100% 59.6154rpx;
     position: relative !important;
   }
-.sk-text-14-7059-57 {
-    background-image: linear-gradient(transparent 14.7059%, #EEEEEE 0%, #EEEEEE 85.2941%, transparent 0%) !important;
-    background-size: 100% 34.0000rpx;
+.sk-text-27-4194-101 {
+    background-image: linear-gradient(transparent 27.4194%, #EEEEEE 0%, #EEEEEE 72.5806%, transparent 0%) !important;
+    background-size: 100% 59.6154rpx;
     position: relative !important;
   }
-.sk-text-34-4444-172 {
-    background-image: linear-gradient(transparent 34.4444%, #EEEEEE 0%, #EEEEEE 65.5556%, transparent 0%) !important;
-    background-size: 100% 90.0000rpx;
+.sk-text-27-4194-301 {
+    background-image: linear-gradient(transparent 27.4194%, #EEEEEE 0%, #EEEEEE 72.5806%, transparent 0%) !important;
+    background-size: 100% 59.6154rpx;
     position: relative !important;
   }
-.sk-text-26-6667-752 {
-    background-image: linear-gradient(transparent 26.6667%, #EEEEEE 0%, #EEEEEE 73.3333%, transparent 0%) !important;
-    background-size: 100% 60.0000rpx;
+.sk-text-27-4194-654 {
+    background-image: linear-gradient(transparent 27.4194%, #EEEEEE 0%, #EEEEEE 72.5806%, transparent 0%) !important;
+    background-size: 100% 59.6154rpx;
     position: relative !important;
   }
-.sk-text-26-6667-108 {
-    background-image: linear-gradient(transparent 26.6667%, #EEEEEE 0%, #EEEEEE 73.3333%, transparent 0%) !important;
-    background-size: 100% 60.0000rpx;
+.sk-text-27-4194-118 {
+    background-image: linear-gradient(transparent 27.4194%, #EEEEEE 0%, #EEEEEE 72.5806%, transparent 0%) !important;
+    background-size: 100% 59.6154rpx;
     position: relative !important;
   }
-.sk-text-26-6667-361 {
-    background-image: linear-gradient(transparent 26.6667%, #EEEEEE 0%, #EEEEEE 73.3333%, transparent 0%) !important;
-    background-size: 100% 60.0000rpx;
+.sk-text-27-4194-737 {
+    background-image: linear-gradient(transparent 27.4194%, #EEEEEE 0%, #EEEEEE 72.5806%, transparent 0%) !important;
+    background-size: 100% 59.6154rpx;
     position: relative !important;
   }
-.sk-text-26-6667-445 {
-    background-image: linear-gradient(transparent 26.6667%, #EEEEEE 0%, #EEEEEE 73.3333%, transparent 0%) !important;
-    background-size: 100% 60.0000rpx;
+.sk-text-27-4194-290 {
+    background-image: linear-gradient(transparent 27.4194%, #EEEEEE 0%, #EEEEEE 72.5806%, transparent 0%) !important;
+    background-size: 100% 59.6154rpx;
     position: relative !important;
   }
-.sk-text-26-6667-283 {
-    background-image: linear-gradient(transparent 26.6667%, #EEEEEE 0%, #EEEEEE 73.3333%, transparent 0%) !important;
-    background-size: 100% 60.0000rpx;
+.sk-text-27-4194-849 {
+    background-image: linear-gradient(transparent 27.4194%, #EEEEEE 0%, #EEEEEE 72.5806%, transparent 0%) !important;
+    background-size: 100% 59.6154rpx;
     position: relative !important;
   }
-.sk-text-34-0909-657 {
-    background-image: linear-gradient(transparent 34.0909%, #EEEEEE 0%, #EEEEEE 65.9091%, transparent 0%) !important;
-    background-size: 100% 88.0000rpx;
+.sk-text-27-4194-738 {
+    background-image: linear-gradient(transparent 27.4194%, #EEEEEE 0%, #EEEEEE 72.5806%, transparent 0%) !important;
+    background-size: 100% 59.6154rpx;
     position: relative !important;
   }
-.sk-text-34-0909-954 {
-    background-image: linear-gradient(transparent 34.0909%, #EEEEEE 0%, #EEEEEE 65.9091%, transparent 0%) !important;
-    background-size: 100% 88.0000rpx;
+.sk-text-27-4194-24 {
+    background-image: linear-gradient(transparent 27.4194%, #EEEEEE 0%, #EEEEEE 72.5806%, transparent 0%) !important;
+    background-size: 100% 59.6154rpx;
     position: relative !important;
   }
-.sk-text-15-0000-737 {
-    background-image: linear-gradient(transparent 15.0000%, #EEEEEE 0%, #EEEEEE 85.0000%, transparent 0%) !important;
-    background-size: 100% 40.0000rpx;
+.sk-text-27-4194-729 {
+    background-image: linear-gradient(transparent 27.4194%, #EEEEEE 0%, #EEEEEE 72.5806%, transparent 0%) !important;
+    background-size: 100% 59.6154rpx;
     position: relative !important;
   }
-.sk-text-15-0000-573 {
-    background-image: linear-gradient(transparent 15.0000%, #EEEEEE 0%, #EEEEEE 85.0000%, transparent 0%) !important;
-    background-size: 100% 40.0000rpx;
+.sk-text-14-2857-319 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 37.6923rpx;
     position: relative !important;
   }
-.sk-text-15-0000-780 {
-    background-image: linear-gradient(transparent 15.0000%, #EEEEEE 0%, #EEEEEE 85.0000%, transparent 0%) !important;
-    background-size: 100% 40.0000rpx;
+.sk-text-27-4194-606 {
+    background-image: linear-gradient(transparent 27.4194%, #EEEEEE 0%, #EEEEEE 72.5806%, transparent 0%) !important;
+    background-size: 100% 59.6154rpx;
     position: relative !important;
   }
-.sk-text-15-0000-518 {
-    background-image: linear-gradient(transparent 15.0000%, #EEEEEE 0%, #EEEEEE 85.0000%, transparent 0%) !important;
-    background-size: 100% 40.0000rpx;
+.sk-text-27-4194-589 {
+    background-image: linear-gradient(transparent 27.4194%, #EEEEEE 0%, #EEEEEE 72.5806%, transparent 0%) !important;
+    background-size: 100% 59.6154rpx;
     position: relative !important;
   }
-.sk-button {
-    color: #EFEFEF !important;
-    background: #EFEFEF !important;
-    border: none !important;
-    box-shadow: none !important;
+.sk-text-27-4194-778 {
+    background-image: linear-gradient(transparent 27.4194%, #EEEEEE 0%, #EEEEEE 72.5806%, transparent 0%) !important;
+    background-size: 100% 59.6154rpx;
+    position: relative !important;
+  }
+.sk-text-27-4194-307 {
+    background-image: linear-gradient(transparent 27.4194%, #EEEEEE 0%, #EEEEEE 72.5806%, transparent 0%) !important;
+    background-size: 100% 59.6154rpx;
+    position: relative !important;
+  }
+.sk-text-27-4194-988 {
+    background-image: linear-gradient(transparent 27.4194%, #EEEEEE 0%, #EEEEEE 72.5806%, transparent 0%) !important;
+    background-size: 100% 59.6154rpx;
+    position: relative !important;
+  }
+.sk-text-27-4194-724 {
+    background-image: linear-gradient(transparent 27.4194%, #EEEEEE 0%, #EEEEEE 72.5806%, transparent 0%) !important;
+    background-size: 100% 59.6154rpx;
+    position: relative !important;
   }
 .sk-image {
     background: #EFEFEF !important;
   }
-.sk-pseudo::before, .sk-pseudo::after {
-      background: #EFEFEF !important;
-      background-image: none !important;
-      color: transparent !important;
-      border-color: transparent !important;
-    }
-.sk-pseudo-rect::before, .sk-pseudo-rect::after {
-      border-radius: 0 !important;
-    }
-.sk-pseudo-circle::before, .sk-pseudo-circle::after {
-      border-radius: 50% !important;
-    }
 .sk-container {
     position: absolute;
     left: 0;

packageA/market/detail.wxml

@@ -137,17 +137,5 @@
         </view>
     </van-tab>
 </van-tabs>
-<view style="height: 200rpx;" />
-<view class="cu-bar bg-white tabbar border shop footer">
-    <navigator url="#" class="action" style="height: 100%;display: flex; flex-direction: column; align-items: center;" bindtap="toCollect">
-        <view class="cuIcon-cart">
-            <view class="cu-tag badge">{{badge}}</view>
-        </view>
-        购物车
-    </navigator>
-    <picker wx:if="{{detail.tradefield.length>=2}}" range='{{detail.tradefield}}' range-key='tradefield' bindchange='storage'>
-        <view class="bg-orange submit" bindtap="clickBut">加入购物车</view>
-    </picker>
-    <view wx:else class="bg-orange submit" bindtap="clickBut">加入购物车</view>
-</view>
+<view style="height:50rpx;" />
 <wxs src="/utils/hidePrice.wxs" module="handleHide" />

packageA/orderForm/detail.wxml

@@ -64,8 +64,8 @@
     <Consignment slot='出库单' id='Consignment' />
     <Shipments slot='物流单' id='Shipments' />
 </Yl_FunTabs>
-
 <view style="height: 130rpx;" />
+<!-- 
 <view class="footer">
     <view class="price">
         <view class="count">
@@ -86,7 +86,7 @@
             <van-button custom-class='but' wx:if="{{detail.status=='新建' && enable.query(options,'submit')}}" disabled="{{detail.amount<=0}}" bind:click="submit">提交订单</van-button>
         </block>
     </view>
-</view>
+</view> -->
 
 <wxs src="/utils/hidePrice.wxs" module="handleHide" />
 <wxs src="/utils/wxmlQueryPer.wxs" module="enable" />

packageA/orderForm/index.js

@@ -59,7 +59,7 @@ Page({
     if (content.pageNumber > content.pageTotal) return;
     this.setListHeight();
     _Http.basic({
-      "id": 20221224180302,
+      "id": 20231025160203,
       content
     }).then(res => {
       console.log("订单列表", res)
@@ -76,11 +76,7 @@ Page({
       content.pageTotal = res.pageTotal
       this.setData({
         list: res.pageNumber == 1 ? res.data : this.data.list.concat(res.data),
-        total: res.total,
-        amount: currency(res.tips.amount, {
-          symbol: "￥",
-          precision: 2
-        }).format()
+        total: res.total
       })
     })
   },
@@ -169,7 +165,7 @@ Page({
   },
   /* 设置页面高度 */
   setListHeight() {
-    this.selectComponent("#ListBox").setHeight(".tips", this);
+    this.selectComponent("#ListBox").setHeight(".head", this);
   },
   showModal(e) {
     this.setData({

packageA/orderForm/index.wxml

@@ -14,9 +14,10 @@
         <van-tab title="手工关闭" />
         <van-tab title="关闭" />
     </van-tabs>
-    <view class="tips">
+    <view class="head"></view>
+<!--     <view class="tips">
         共计{{total}}单，合计{{handleHide.query(amount,hidePrice)}}元
-    </view>
+    </view> -->
     <Yl_ListBox id='ListBox' bind:getlist='getList'>
         <List list="{{list}}" hidePrice='{{hidePrice}}' />
         <view style="height:150rpx;" />

packageA/shipment/detail.js

@@ -128,37 +128,6 @@ Page({
             }
         }
     },
-    /* 确认收货 */
-    receiving() {
-        let that = this;
-        wx.showModal({
-            title: '提示',
-            content: '是否确认收货?确认后不可更改',
-            complete: (res) => {
-                if (res.confirm) _Http.basic({
-                    "id": "20230721104302",
-                    "content": {
-                        "sa_logisticsid": that.data.sa_logisticsid
-                    }
-                }).then(s => {
-                    console.log("确认收货", s)
-                    if (s.msg != '成功') return wx.showToast({
-                        title: s.msg,
-                        icon: "none",
-                        mask: true
-                    });
-                    that.getDetail(true, false);
-                    setTimeout(() => {
-                        wx.showToast({
-                            title: '确认收货成功',
-                            icon: "none",
-                            mask: true
-                        });
-                    }, 500);
-                })
-            }
-        })
-    },
     onReachBottom() {
         this.partialRenewal();
     },

packageA/shipment/detail.wxml

@@ -16,8 +16,4 @@
 	<!-- <Binding slot='装箱明细' id='Binding' /> -->
 	<Delivery slot='送货明细' id='Delivery' />
 	<view style="height: 140rpx;" />
-</Yl_FunTabs>
-
-<view class="footer" wx:if="{{detail.status=='审核'}}">
-	<van-button custom-class='but' bind:click="receiving">确认收货</van-button>
-</view>
+</Yl_FunTabs>

packageA/shipment/index.js

@@ -48,7 +48,7 @@ Page({
 		if (init) content.pageNumber = 1;
 		if (content.pageNumber > content.pageTotal) return;
 		_Http.basic({
-			"id": 20230720142102,
+			"id": 20231030093503,
 			content
 		}).then(res => {
 			console.log("物流单", res)

packageA/shipment/modules/list/index.wxml

@@ -1,6 +1,6 @@
 <view class="item" wx:for="{{list}}" wx:key="billno">
     <navigator url="#" class="top" data-num="{{item.logisticno}}" bindtap="copyNum">
-        {{item.logiscomp_name}} : {{item.logisticno||' --'}} <text wx:if="{{item.logisticno}}">复制</text>
+        {{item.logiscomp_name||'物流公司'}} : {{item.logisticno||' 暂无物流单号'}} <text wx:if="{{item.logisticno}}">复制</text>
     </navigator>
     <navigator url="/packageA/shipment/detail?id={{item.sa_logisticsid}}" class="content">
         <view class="num">

pages/index/collect/index.js

@@ -135,7 +135,6 @@ Component({
 					title: res.msg,
 					icon: "none"
 				});
-				getApp().globalData.getCollectCount()
 				wx.showModal({
 					title: '提示',
 					content: '生成成功!是否立即前往',
@@ -275,7 +274,6 @@ Component({
 						});
 						if (res.msg != '成功') return;
 						this.getList(true)
-						getApp().globalData.getCollectCount()
 					})
 				}
 			})

pages/index/index.js

@@ -4,11 +4,9 @@ let pageInit = null,
 		vIndate
 	} = require("../../utils/pay");
 
-
 Page({
 	data: {
 		PageCur: 'Home',
-		collectCount: "", //购物车商品数量
 		msgList: []
 	},
 	onLoad(options) {
@@ -23,7 +21,6 @@ Page({
 			PageCur: options.PageCur
 		})
 		this.refreshData();
-		this.getCollectCount();
 		this.updateMsgCount();
 		this.getAnnunciate();
 		if (getApp().globalData.remindchangepassword_str) wx.showModal({
@@ -60,15 +57,11 @@ Page({
 			})
 		})
 	},
-	onShow() {
-		// if (wx.getAccountInfoSync().miniProgram.envVersion !== 'release') this.refreshData();
-	},
 	/**
 	 * 更新站点信息
 	 * 主要用来渲染首页的banner和宫格
 	 */
 	refreshData() {
-		getApp().globalData.getCollectCount = this.getCollectCount.bind(this); //更新购物车件数
 		getApp().globalData.socketCallback = this.updateMsgCount.bind(this); //更新信息数量
 		getApp().globalData.changeBar = this.cutBar.bind(this); //切换首页页面
 		let page = this.selectComponent("#Home");
@@ -130,11 +123,11 @@ Page({
 			//E订单
 			function getedd() {
 				let paths = [{
-					name: "商城",
+					key: "ProductQuery",
 					PageCur: "Market",
 					icon: "work-shangcheng"
 				}, {
-					name: "订货单",
+					key: "qOrderBlank",
 					path: "/packageA/orderForm/index",
 					icon: "work-dingdan"
 				}, {
@@ -146,7 +139,7 @@ Page({
 					path: "/packageA/account/index",
 					icon: "work-zhanghu"
 				}, {
-					name: "促销活动",
+					key: 'qDiscounts',
 					path: "/packageA/activity/index",
 					icon: "work-cuxiaohuodong"
 				}, {
@@ -154,7 +147,7 @@ Page({
 					path: "/packageA/remitVoucher/index",
 					icon: "work-dakuanpingzheng"
 				}, {
-					name: "物流单",
+					key: "qLogistics",
 					path: "/packageA/shipment/index",
 					icon: "icon-shouhuo"
 				}, {
@@ -166,7 +159,7 @@ Page({
 					path: "/packageA/dispatchBill/index",
 					icon: "icon-shouhuo"
 				}, {
-					name: "发货明细",
+					key: "qdeliverydetail",
 					path: "/packageA/dispatchBill/rows",
 					icon: "icon-shouhuo"
 				}, {
@@ -183,10 +176,11 @@ Page({
 							optionnames: s.meta.auth.map(a => a.optionname),
 						}
 						if (authList[s.name].options.some(s => s == "read")) {
-							let i = paths.findIndex(k => k.name == s.meta.title);
+							let i = paths.findIndex(k => k.key == s.name);
 							if (i != -1) {
 								paths[i].index = i;
 								paths[i].isneedpay = s.isneedpay;
+								paths[i].name = s.meta.title;
 								list.push(paths[i])
 							}
 						}
@@ -263,27 +257,11 @@ Page({
 			setTimeout(this.refreshData, 10);
 			return;
 		}
-
-
 	},
 	/* 获取通告列表 */
 	/**
 	 * 更新购物车数量
 	 */
-	getCollectCount() {
-		return _Http.basic({
-			"id": 20220927093202,
-			"content": {}
-		}).then(res => {
-			console.log("购物车数量", res)
-			getApp().globalData.collectCount = res.data.num;
-			pageInit.Collect = false;
-			this.setData({
-				collectCount: res.data.num
-			})
-			return res.data.num;
-		});
-	},
 	/* 更新消息数量 */
 	updateMsgCount() {
 		pageInit.Message = false;

pages/index/index.wxml

@@ -29,15 +29,15 @@
 			<view class="cu-tag badge" wx:if="{{fcount}}">{{fcount}}</view>
 		</view> 消息
 	</view>
+	
 	<view class="action {{PageCur=='Market'?'text-blue':'text-gray'}} add-action" bindtap="NavChange" data-cur="Market">
 		<button class="cu-btn cuIcon-shopfill bg-blue shadow"></button>
-		商城
+		业绩目标
 	</view>
-	<view class="action  {{PageCur=='Collect'?'text-blue':'text-gray'}}" bindtap="NavChange" data-cur="Collect">
-		<view class=" cuIcon-cart">
-			<view class="cu-tag badge">{{collectCount}}</view>
-		</view>
-		购物车
+
+	<view class="action  {{PageCur=='Market'?'text-blue':'text-gray'}}" bindtap="NavChange" data-cur="Market">
+		<view class="cuIcon-shopfill"></view>
+		商品
 	</view>
 	<view class="action  {{PageCur=='UserCenter'?'text-blue':'text-gray'}}" bindtap="NavChange" data-cur="UserCenter">
 		<view class="cuIcon-my"></view>

pages/index/market/index.wxml

@@ -10,12 +10,9 @@
 		<view style="height: 200rpx;" />
 	</Yl_ListBox>
 </view>
-
-
 <view class="DrawerClose {{modalName=='viewModal'?'show':''}}" bindtap="hideModal">
 	<text class="cuIcon-pullright"></text>
 </view>
-
 <scroll-view scroll-y class="DrawerWindow  {{modalName=='viewModal'?'show':''}}">
 	<view style="height:{{CustomBar}}px" />
 	<view class="cu-list menu card-menu margin-top-xl margin-bottom-xl shadow-lg bg-white">

pages/index/market/modules/list/index.js

@@ -22,37 +22,6 @@ Component({
           sa_brandid:item.sa_brandid
         })}`,
       })
-    },
-    buyMore(e) {
-      const item = e.currentTarget.dataset.item.item[0];
-      const item1 = e.currentTarget.dataset.item;
-      wx.showModal({
-        title: '提示',
-        content: `是否确定将“${item.itemname}”加入到购物车`,
-        complete: (res) => {
-          if (res.confirm) _Http.basic({
-            "id": 20220924095102,
-            "content": {
-              sa_brandid: item1.sa_brandid,
-              "itemid": item.itemid, //货品id
-              "qty": item.orderminqty, //数量
-              itemno: item.itemno, //货品编号
-              tradefield: item1.tradefield,
-              width: item.width,
-              length: item.length
-            },
-          }).then(res => {
-            console.log("加入购物车", res)
-            wx.showToast({
-              title: res.msg == '成功' ? '加入成功' : res.msg,
-              icon: "none"
-            });
-            if (res.msg == '成功') getApp().globalData.getCollectCount().then(badge => this.setData({
-              badge
-            }))
-          })
-        }
-      })
-    },
+    }
   }
 })

pages/index/market/modules/list/index.wxml

@@ -11,7 +11,6 @@
 	</view>
 	<view class="right-box">
 		<view class="title line-1">{{item.groupname||'--'}}</view>
-
 		<view class="tags">
 			<view style="background: #FA8C16;">
 				{{item.brandname}}
@@ -26,7 +25,6 @@
 		<view class="type line-1">
 			规格：{{item.item[0].standards || ' --'}}
 		</view>
-
 		<view class="price">
 			<view style="display: flex;">
 				<view class="view" wx:if="{{item.minprice==item.maxprice}}">
@@ -37,9 +35,6 @@
 				</view>
 				<view class="punit">× {{item.unitname}}</view>
 			</view>
-			<navigator wx:if="{{!item.isscheme}}" url="#" class="shopping" data-item="{{item}}" catchtap="buyMore">
-				<text class="iconfont icon-gouwuche" />
-			</navigator>
 		</view>
 	</view>
 </navigator>

project.config.json

@@ -53,7 +53,7 @@
     "ignore": [],
     "include": []
   },
-  "appid": "wx7505ddb0a1ec6146",
+  "appid": "wx2c833754ffbbe51b",
   "projectname": "E_WeChat",
   "libVersion": "2.29.1",
   "simulatorPluginLibVersion": {}

project.private.config.json

@@ -1,6 +1,6 @@
 {
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "projectname": "%E6%9D%A5%E6%96%AF%E5%A5%A5E%E8%AE%A2%E5%8D%95",
+  "projectname": "E订单区域经理端",
   "setting": {
     "compileHotReLoad": true,
     "urlCheck": false