xiaohaizhao 10 mēneši atpakaļ
vecāks
revīzija
95102a1272

+ 0 - 44
packageA/market/detail.js

@@ -27,7 +27,6 @@ Page({
 			spec: ""
 		},
 		privacyFieldC: [],
-		isShowFavorites: false
 	},
 	onLoad(options) {
 		let data = JSON.parse(options.params);
@@ -36,7 +35,6 @@ Page({
 		this.data.content.sa_itemgroupid = data.sa_itemgroupid;
 		this.setData({
 			userrole: wx.getStorageSync('userrole'),
-			isShowFavorites: wx.getStorageSync('auth').wfavorites ? true : false,
 			isdisplaysaleqty: wx.getStorageSync('siteP').isdisplaysaleqty
 		})
 		try {
@@ -279,48 +277,6 @@ Page({
 			}))
 		})
 	},
-	/* 加入收藏夹 */
-	addToFavorites() {
-		let detail = this.data.detail,
-			iscollection = detail.iscollection == 1 ? false : true,
-			custom = {
-				width: 0,
-				length: 0,
-			},
-			favorites = {};
-		//是否为定制项
-		if (detail.iscustomsize == 1) custom = this.selectComponent("#customMade").getResult(true);
-		for (const key in custom) {
-			favorites['favorites' + key] = custom[key]
-		}
-		if (typeof custom == "boolean") return;
-		_Http.basic({
-			"id": 20231121143403,
-			"content": {
-				"itemid": this.data.detail.itemid, //货品id
-				"qty": detail.qty, //数量
-				...custom,
-				iscollection,
-				...favorites
-			},
-		}).then(res => {
-			console.log(iscollection + "收藏夹", res)
-			wx.showToast({
-				title: res.msg == '成功' ? iscollection ? '收藏成功' : "已取消收藏" : res.msg,
-				icon: "none"
-			});
-			if (res.msg == '成功') {
-				getApp().globalData.getFavoriteCount().then(num => {
-					this.setData({
-						favoriteCount: num
-					})
-				})
-				this.setData({
-					"detail.iscollection": iscollection ? 1 : 0
-				})
-			}
-		})
-	},
 	/* 立即下单 */
 	placeAnOrder(index) {
 		let detail = this.data.detail,

+ 3 - 4
packageA/market/detail.wxml

@@ -14,8 +14,7 @@
 <view class="intr">
     <view class="title">
         {{detail.itemname}}
-        <text wx:if="{{isShowFavorites}}" class="{{detail.iscollection?'cuIcon-favorfill':'cuIcon-favor'}}" style="color:{{detail.iscollection?'#FADB14':''}};padding: 6rpx;" id='addToFavorites' bind:tap="{{'clickBut'}}" />
-        <van-tag size='medium' type="warning">{{detail.delistingstatus}}</van-tag>
+        <van-tag  wx:if='{{detail.delistingstatus}}' size='medium' type="warning">{{detail.delistingstatus}}</van-tag>
     </view>
     <view class="tags">
         <text wx:if="{{detail.iscustomsize==1}}" style="background-color: #EE0A24;color: #fff;">定制</text>
@@ -107,12 +106,12 @@
             <view class="row">
                 规格:{{detail.standards || ' --'}}
             </view>
-            <view class="row">
+          <!--   <view class="row">
                 别名:{{detail.byname || ' --'}}
             </view>
             <view class="row">
                 特殊说明:<text wx:if="{{detail.specalnote}}" style="color: red;">{{detail.specalnote}}</text><text wx:else> --</text>
-            </view>
+            </view> -->
         </view>
     </van-tab>
     <van-tab title="产品资料">

+ 2 - 7
pages/index/index.js

@@ -26,7 +26,7 @@ Page({
 		this.refreshData();
 
 		this.getCollectCount();
-		this.getFavoriteCount();
+		//	this.getFavoriteCount();
 
 		this.updateMsgCount();
 		this.getAnnunciate();
@@ -83,7 +83,7 @@ Page({
 	 */
 	refreshData() {
 		getApp().globalData.getCollectCount = this.getCollectCount.bind(this); //更新购物车件数
-		getApp().globalData.getFavoriteCount = this.getFavoriteCount.bind(this); //更新收藏夹件数
+		//	getApp().globalData.getFavoriteCount = this.getFavoriteCount.bind(this);更新收藏夹件数
 
 		getApp().globalData.socketCallback = this.updateMsgCount.bind(this); //更新信息数量
 		getApp().globalData.changeBar = this.cutBar.bind(this); //切换首页页面
@@ -158,11 +158,6 @@ Page({
 					key: "wtarget",
 					path: "/packageA/target/index",
 					icon: "work-yejimubiao"
-				}, {
-					name: "收藏夹",
-					key: "wfavorites",
-					path: "/packageA/favorites/index",
-					icon: "work-webshoucang"
 				}, {
 					name: "通告",
 					path: "/marketing/annunciate/index",

+ 5 - 0
pages/index/market/index.js

@@ -122,6 +122,7 @@ Component({
       if (init) content.pageNumber = 1;
       if (content.pageNumber > content.pageTotal) return;
       content.brandids = [sa_brandid];
+      content.ismodule = 0;
       _Http.basic({
         "id": 20220926142203,
         content
@@ -131,6 +132,10 @@ Component({
           title: res.msg,
           icon: "none"
         })
+        res.data = res.data.map(v => {
+          v.itemclass = v.itemclass.map(s => s.itemclassname)
+          return v
+        })
         this.selectComponent('#ListBox').RefreshToComplete();
         content.pageNumber = res.pageNumber + 1;
         content.pageTotal = res.pageTotal;

+ 3 - 15
pages/index/market/modules/list/index.wxml

@@ -7,25 +7,14 @@
 	</view>
 	<view class="right-box">
 		<view class="title line-1">{{item.groupname||'--'}}</view>
-		<!-- 	<view class="tags">
-			<view style="background: #FA8C16;">
-				{{item.brandname}}
-			</view>
-			<view wx:if="{{item.tradefield}}" style="background: #FF3B30;">
-				{{item.tradefield}}
-			</view>
-		</view> -->
-		<view class="type line-1">
-			型号:{{item.item[0].model || ' --'}}
-		</view>
 		<view class="type line-1">
-			规格:{{item.item[0].standards || ' --'}}
+			品号:{{item.item[0].itemno || ' --'}}
 		</view>
 		<view class="type line-1">
-			别名:{{item.item[0].byname||' --'}}
+			型号:{{item.item[0].model || ' --'}}
 		</view>
 		<view class="type line-1">
-			包装数量:{{item.item[0].packageqty || '0'}}
+			分类:{{item.itemclass || ' --'}}
 		</view>
 		<view class="price">
 			<view style="display: flex;">
@@ -38,7 +27,6 @@
 				<view class="punit" wx:if="{{isdisplaysaleqty}}">已售{{((item.item[0].soldbase-0)+(item.item[0].saleqty-0))||0}}{{item.unitname}}</view>
 			</view>
 			<view wx:if="{{!item.isscheme}}" class="shopping" data-item="{{item}}" data-index="{{index}}" catchtap="buyMore">
-				<view hover-class="navigator-hover" wx:if="{{isShowFavorites}}" url="#" data-name="收藏" class="{{item.item[0].iscollection?'cuIcon-favorfill':'cuIcon-favor'}} cuIcon" style="color:{{item.item[0].iscollection?'#FADB14':''}}" />
 				<view hover-class="navigator-hover" url="#" data-name="购物车" class="iconfont icon-gouwuche" />
 			</view>
 		</view>

+ 7 - 3
project.config.json

@@ -42,7 +42,11 @@
       "sass"
     ],
     "condition": false,
-    "compileWorklet": false
+    "compileWorklet": false,
+    "localPlugins": false,
+    "disableUseStrict": false,
+    "swc": false,
+    "disableSWC": true
   },
   "compileType": "miniprogram",
   "condition": {},
@@ -54,8 +58,8 @@
     "ignore": [],
     "include": []
   },
-  "appid": "wx7505ddb0a1ec6146",
+  "appid": "wxaae80a5bab4652f8",
   "projectname": "E_WeChat",
-  "libVersion": "2.29.1",
+  "libVersion": "3.6.6",
   "simulatorPluginLibVersion": {}
 }

+ 17 - 169
project.private.config.json

@@ -1,177 +1,25 @@
 {
   "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": "%E7%BE%8E%E5%A4%A7E%E8%AE%A2%E5%8D%95",
   "setting": {
     "compileHotReLoad": true,
     "urlCheck": false,
-    "autoAudits": true
+    "autoAudits": true,
+    "coverView": true,
+    "lazyloadPlaceholderEnable": false,
+    "skylineRenderEnable": false,
+    "preloadBackgroundData": false,
+    "useApiHook": true,
+    "useApiHostProcess": true,
+    "showShadowRootInWxmlPanel": true,
+    "useStaticServer": false,
+    "useLanDebug": false,
+    "showES6CompileOption": false,
+    "checkInvalidKey": true,
+    "ignoreDevUnusedFiles": true,
+    "bigPackageSizeSupport": false,
+    "useIsolateContext": true
   },
   "libVersion": "3.6.6",
-  "condition": {
-    "miniprogram": {
-      "list": [
-        {
-          "name": "packageA/deliveryConfirmation/index",
-          "pathName": "packageA/deliveryConfirmation/index",
-          "query": "",
-          "scene": null,
-          "launchMode": "default"
-        },
-        {
-          "name": "packageA/deliveryConfirmation/detail",
-          "pathName": "packageA/deliveryConfirmation/detail",
-          "query": "id=1",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "到货通知",
-          "pathName": "packageA/deliveryConfirmation/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "packageA/shipment/detail",
-          "pathName": "packageA/shipment/detail",
-          "query": "id=354",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "packageA/orderForm/detail",
-          "pathName": "packageA/orderForm/detail",
-          "query": "id=343043",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "packageA/orderForm/index",
-          "pathName": "packageA/orderForm/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "套餐订单",
-          "pathName": "packageA/orderForm/detail",
-          "query": "id=343021",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "选择套餐",
-          "pathName": "packageA/activity/bindingProduct/index",
-          "query": "params=%7B%22id%22%3A20230116094803%2C%22version%22%3A1%2C%22content%22%3A%7B%22nocache%22%3Atrue%2C%22sa_brandid%22%3A49%2C%22sa_promotionid%22%3A4127%2C%22where%22%3A%7B%22condition%22%3A%22%22%2C%22packagetypemx%22%3A%22%22%7D%7D%7D",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "促销活动",
-          "pathName": "packageA/activity/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "套餐活动",
-          "pathName": "packageA/activity/detail",
-          "query": "id=4127",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "打款凭证",
-          "pathName": "packageA/remitVoucher/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "商城详情",
-          "pathName": "packageA/market/detail",
-          "query": "params=%7B%22sa_itemgroupid%22%3A4536%2C%22sa_brandid%22%3A32%7D",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pages/index/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "12",
-          "pathName": "packageA/market/detail",
-          "query": "params=%7B%22sa_itemgroupid%22%3A4946%2C%22sa_brandid%22%3A46%7D",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "123",
-          "pathName": "pages/index/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "退返申请单",
-          "pathName": "packageA/returnOne/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "首页",
-          "pathName": "pages/index/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "3434",
-          "pathName": "packageA/orderForm/detail",
-          "query": "id=257773",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "订单明细",
-          "pathName": "packageA/orderForm/rows",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "cxhd",
-          "pathName": "packageA/activity/detail",
-          "query": "id=1803",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "促销活动",
-          "pathName": "packageA/activity/detail",
-          "query": "id=2660",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "业绩目标",
-          "pathName": "packageA/target/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "商品详情",
-          "pathName": "packageA/market/detail",
-          "query": "params=%7B%22sa_itemgroupid%22%3A6009%2C%22sa_brandid%22%3A47%7D",
-          "launchMode": "default",
-          "scene": null
-        }
-      ]
-    }
-  }
+  "condition": {}
 }

BIN
static/image/logo.png