Browse Source

商城修改

xiaohaizhao 2 years ago
parent
commit
e104e5bb2b

+ 4 - 21
packageA/market/detail.js

@@ -193,28 +193,11 @@ Page({
       },
     }).then(res => {
       console.log("加入购物车", res)
-      if (res.msg != '成功') return wx.showToast({
-        title: res.msg,
+      wx.showToast({
+        title: res.msg == '成功' ? '加入成功' : res.msg,
         icon: "none"
       });
-      _Http.basic({
-        "id": 20220927093202,
-        "content": {}
-      }, false).then(res => {
-        console.log("购物车数量", res)
-        getApp().globalData.num = res.data.num;
-        if (this.data.userrole == '经销商') this.selectComponent("#Float").setNum(res.data.num)
-        setTimeout(() => {
-          wx.showToast({
-            title: '加入成功',
-            icon: "none",
-            icon: "none"
-          });
-        }, 200);
-      });
+      if (res.msg == '成功') getApp().globalData.getCollectCount()
     })
-  },
-  onShow() {
-    if (this.data.userrole == '经销商') this.selectComponent("#Float").setNum(getApp().globalData.num)
-  },
+  }
 })

+ 0 - 1
packageA/market/detail.json

@@ -1,5 +1,4 @@
 {
   "usingComponents": {
-    "Float": "../shopping/modules/float"
   }
 }

+ 0 - 7
packageA/market/detail.wxml

@@ -68,11 +68,7 @@
       <navigator url="#" class="product {{content.cheek===item.parm?'active':''}}  {{item.flag?'':'disabled'}}" wx:for="{{cheekRows}}" wx:key="index" bindtap="changeItemno" data-valuename="cheek" data-value="{{item}}">{{item.parm}}</navigator>
     </view>
   </block>
-
 </view>
-
-
-
 <van-tabs custom-class='tabs' title-active-color='var(--assist)' color='var(--assist)'>
   <van-tab title="商品简介">
     <view class="tab-box">
@@ -115,7 +111,6 @@
     </view>
   </van-tab>
 </van-tabs>
-
 <block wx:if="{{userrole!='业务员'}}">
   <!-- 底部 -->
   <view style="height: 150rpx;" />
@@ -126,6 +121,4 @@
     <van-button wx:else custom-class='but' bindtap="clickBut">加入购物车
     </van-button>
   </view>
-  <!-- 购物车按钮 -->
-  <Float id="Float" />
 </block>

+ 0 - 307
packageA/market/index.js

@@ -1,307 +0,0 @@
-const _Http = getApp().globalData.http;
-Page({
-
-	data: {
-		istool: 1, //0商品 1工具
-		brand: {}, //当前品牌
-		brandList: [], //品牌列表
-		typeList: [],
-		cType: {},
-		loading: true,
-		"content": {
-			"pageNumber": 1,
-			"pageTotal": 1,
-			"where": {
-				"condition": ""
-			},
-			sort: []
-		},
-		filter: [{
-			label: "标准",
-			index: null,
-			showName: "value", //显示字段
-			valueKey: "name", //返回Key
-			selectKey: "value", //传参 代表选着字段 不传参返回整个选择对象
-			value: "", //选中值
-			list: []
-		}],
-		sys_enterpriseid: "",
-
-	},
-	onLoad(options) {
-		this.setData({
-			istool: options.istool ? 1 : 0,
-			userrole: wx.getStorageSync('userrole')
-		})
-		this.getBrand()
-		this.getNum();
-		this.getTradefie();
-		this.getOptionTypeSelect();
-	},
-	/* 业务员选择角色 */
-	selsectedRole(e) {
-		wx.navigateTo({
-			url: './selected/index',
-		})
-		getApp().globalData.handleSelect = this.handleRole.bind(this);
-	},
-	handleRole({
-		sys_enterpriseid,
-		enterprisename
-	}) {
-		console.log(sys_enterpriseid)
-		this.setData({
-			buttonText: enterprisename,
-			tradefieid: "",
-			sys_enterpriseid
-		});
-		this.getBrand();
-		this.getTradefie();
-		wx.navigateBack();
-	},
-	onCleaRole() {
-		this.setData({
-			buttonText: "",
-			sys_enterpriseid: ""
-		})
-		setTimeout(() => {
-			this.getTradefie();
-			this.getBrand();
-		}, 0)
-	},
-	/* 获取系统分类 */
-	getOptionTypeSelect() {
-		_Http.basic({
-			"classname": "sysmanage.develop.optiontype.optiontype",
-			"method": "optiontypeselect",
-			"content": {
-				"pageNumber": 1,
-				"pageSize": 999,
-				"typename": "itemstandards",
-				"parameter": {
-					"siteid": wx.getStorageSync('userMsg').siteid
-				}
-			}
-		}, false).then(res => {
-			console.log("系统标准列表", res)
-			if (res.msg == '成功') this.setData({
-				"filter[0].list": res.data
-			})
-		})
-	},
-	/* 处理筛选 */
-	handleFilter({
-		detail
-	}) {
-		console.log(detail)
-	},
-	/* 获取领域 */
-	getTradefie() {
-		let content = {
-			nocache: true,
-			pageNumber: 1,
-			pageSize: 9999,
-			where: {
-				condition: ""
-			}
-		};
-		if (this.data.sys_enterpriseid) content.sys_enterpriseid = this.data.sys_enterpriseid;
-		_Http.basic({
-			"id": 20221223141802,
-			content
-		}, false).then(res => {
-			console.log("获取领域", res)
-			if (res.msg != '成功') {
-				res.data = [{
-					rowindex: 0,
-					subvalues: [],
-					sys_enterprise_tradefieldid: 0,
-					tradefield: "全部"
-				}]
-			} else {
-				if (res.data.length == 1) {
-					res.data[0] = {
-						rowindex: 0,
-						subvalues: [],
-						sys_enterprise_tradefieldid: 0,
-						tradefield: "全部"
-					}
-				} else {
-					res.data.unshift({
-						rowindex: 0,
-						subvalues: [],
-						sys_enterprise_tradefieldid: 0,
-						tradefield: "全部"
-					})
-				}
-			}
-			this.setData({
-				tradefieid: "",
-				tradefieList: res.data
-			});
-		})
-	},
-	/* 切换领域 */
-	tradefieChange(e) {
-		this.setData({
-			tradefieid: e.detail.item.tradefield == '全部' ? "" : e.detail.item.tradefield
-		})
-		this.getList(true);
-	},
-	/* 切换分类 */
-	typeChange({
-		detail
-	}) {
-		let typeList = this.data.typeList;
-		if (typeList.length - 1 != detail.rowIndex) typeList = typeList.slice(0, detail.rowIndex + 1);
-		typeList[detail.rowIndex].active = detail.index
-		if (detail.item.subdep.length) typeList.push({
-			active: -1,
-			list: detail.item.subdep
-		})
-		this.setData({
-			cType: detail.item,
-			typeList
-		});
-		this.getList(true);
-	},
-	/* 获取品牌 */
-	getBrand() {
-		let content = {
-			nocache: true,
-			pageSize: 999,
-		};
-		if (this.data.sys_enterpriseid) content.sys_enterpriseid = this.data.sys_enterpriseid;
-		_Http.basic({
-			"id": 20220924163702,
-			content
-		}).then(res => {
-			console.log("查询品牌", res)
-			if (res.msg != '成功') return wx.showToast({
-				title: res.msg,
-				icon: "none"
-			});
-			if (res.data.length != 0) {
-				this.setData({
-					brandList: res.data,
-				});
-				this.data.brand = res.data[0];
-				this.getTypeList();
-			} else {
-				wx.showToast({
-					title: '未查询到授权品牌',
-					icon: "none"
-				})
-				this.setData({
-					brandList: [],
-					loading: false,
-					list: [],
-					typeList: []
-				})
-			}
-		})
-	},
-	/* 切换品牌 */
-	brandChange(e) {
-		this.data.brand = e.detail.item;
-		this.getTypeList();
-	},
-	/* 获取分类 */
-	getTypeList() {
-		let content = {
-			sa_brandid: this.data.brand.sa_brandid,
-			nocache: true,
-			where: {
-				istool: 0, //默认0,不是工具,1表示工具
-			}
-		}
-		if (this.data.sys_enterpriseid) content.sys_enterpriseid = this.data.sys_enterpriseid;
-		_Http.basic({
-			"id": "20220922110403",
-			"pageSize": 1000,
-			content
-		}).then(res => {
-			console.log("营销类别", res)
-
-			if (res.data[0].ttemclass) {
-				res.data[0].ttemclass.unshift({
-					itemclassid: "",
-					itemclassfullname: "全部",
-					itemclassname: "全部",
-					subdep: []
-				})
-				this.setData({
-					['typeList[0]']: {
-						active: 0,
-						list: res.data[0].ttemclass
-					},
-					"cType": res.data[0].ttemclass[0],
-					loading: false
-				});
-			}
-			this.getList(true);
-		})
-	},
-	/* 获取产品 */
-	getList(init = false) {
-		if (init.detail != undefined) init = init.detail;
-		let content = JSON.parse(JSON.stringify(this.data.content));
-		if (init) content.pageNumber = 1;
-		if (content.pageNumber > content.pageTotal) return;
-		content.brandids = [this.data.brand.sa_brandid];
-		content.where.itemclassid = this.data.cType.itemclassid;
-		content.where.tradefield = this.data.tradefieid;
-		if (this.data.sys_enterpriseid) content.sys_enterpriseid = this.data.sys_enterpriseid;
-		_Http.basic({
-			"id": 20220926142203,
-			content
-		}).then(res => {
-			console.log("商品列表", res)
-			this.selectComponent('#ListBox').RefreshToComplete();
-			this.setData({
-				list: res.pageNumber == 1 ? res.data : this.data.list.concat(res.data),
-				"content.pageNumber": res.pageNumber + 1,
-				"content.pageTotal": res.pageTotal,
-				"content.sort": res.sort,
-				loading: false
-			})
-			this.setListHeight()
-		})
-	},
-	startFiltration() {
-		/* _Http.basic().then(res => {
-			console.log("获取领域", res)
-		}) */
-	},
-	/* 搜索 */
-	onSearch({
-		detail
-	}) {
-		this.setData({
-			"content.where.condition": detail
-		});
-		this.getList(true)
-	},
-	onReady() {
-		this.setListHeight()
-	},
-	/* 设置页面高度 */
-	setListHeight() {
-		this.selectComponent("#ListBox").setHeight(".division", this);
-	},
-	/* 获取购物车数量 */
-	getNum() {
-		if (this.data.userrole == '业务员') return;
-		_Http.basic({
-			"id": 20220927093202,
-			"content": {}
-		}).then(res => {
-			console.log("购物车数量", res)
-			getApp().globalData.num = res.data.num;
-			this.selectComponent("#Float").setNum(res.data.num)
-		});
-	},
-	onShow() {
-		if (getApp().globalData.num && this.data.userrole != '业务员') this.selectComponent("#Float").setNum(getApp().globalData.num)
-	}
-})

+ 0 - 7
packageA/market/index.json

@@ -1,7 +0,0 @@
-{
-  "usingComponents": {
-    "List": "./modules/list/index",
-    "Tabs": "./modules/tabs/index",
-    "Float": "../shopping/modules/float"
-  }
-}

+ 0 - 59
packageA/market/index.scss

@@ -1,59 +0,0 @@
-@import "./index.skeleton.wxss";
-
-.role {
-	position: relative;
-	margin-top: -20rpx;
-
-	.clear {
-		position: absolute;
-		height: 38px;
-		line-height: 38px;
-		width: 32px;
-		z-index: 999;
-		top: 0;
-		right: 0;
-		color: #666666;
-		background-color: #fff;
-	}
-
-	.cell {
-		padding-top: 14rpx !important;
-		padding-bottom: 14rpx !important;
-	}
-
-	.cell-value {
-		font-size: 26rpx;
-		overflow: hidden;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		padding-left: 10rpx;
-		color: #333;
-	}
-}
-
-
-.title-value {
-	font-size: 26rpx;
-}
-
-.brand-box {
-	margin-left: 30rpx;
-	padding-bottom: 20rpx;
-
-	.brand-tab-class {
-		height: 52rpx;
-		line-height: 52rpx;
-		font-size: 24rpx;
-		color: #666666;
-	}
-
-	.brand-active-class {
-		border-radius: 26rpx;
-		background-color: #FAFAFA;
-	}
-}
-
-.division {
-	height: 10rpx;
-	background-color: #F4F5F7;
-}

+ 0 - 217
packageA/market/index.skeleton.wxml

@@ -1,217 +0,0 @@
-<!--
-此文件为开发者工具生成,生成时间: 2022/12/23下午1:47:07
-使用方法:
-在 E:\云链项目\e-wechat\packageA\market\index.wxml 引入模板
-
-```
-<import src="index.skeleton.wxml"/>
-<template is="skeleton" wx:if="{{loading}}" />
-```
-
-在 E:\云链项目\e-wechat\packageA\market\index.wxss 中引入样式
-```
-@import "./index.skeleton.wxss";
-```
-
-更多详细信息可以参考文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/skeleton.html
--->
-<template name="skeleton">
-  <view class="sk-container">
-    <view class="head">
-      <view class="search">
-        <view class="iconfont icon-a-sousuolansousuo sk-pseudo sk-pseudo-circle" style="padding-left:10px;margin-right: 5px;"></view>
-        <view class="input sk-image" placeholder="搜索商品" style="flex: 1;" type="text" value="true"></view>
-      </view>
-      <navigator class="but sk-transparent">
-        <text class="iconfont icon-shengxu sk-pseudo sk-pseudo-circle"></text>排序</navigator>
-      <navigator class="but sk-transparent">
-        <text class="iconfont icon-shaixuan sk-pseudo sk-pseudo-circle"></text>筛选</navigator>
-    </view>
-    <view is="packageA/market/modules/tabs/index">
-      <scroll-view enable-passive="true" enhanced="true" scroll-with-animation="true" scroll-x="true" class="index--scroll-box" scroll-left="0">
-        <view class="index--box brand-box" style="scroll-snap-align: none;">
-          <view class="index--item brand-tab-class index--active brand-active-class sk-transparent sk-text-26-9231-854 sk-text" data-index="0" data-item="[object Object]" id="0c117c11--active0">
-            班尼戈
-          </view>
-        </view>
-      </scroll-view>
-    </view>
-    <view is="packageA/market/modules/tabs/index">
-      <scroll-view enable-passive="true" enhanced="true" scroll-with-animation="true" scroll-x="true" class="index--scroll-box" scroll-left="0">
-        <view class="index--box brand-box" style="scroll-snap-align: none;">
-          <view class="index--item brand-tab-class index--active brand-active-class sk-transparent sk-text-26-9231-720 sk-text" data-index="0" data-item="[object Object]" id="12d36c89--active0">
-            辅材配件
-          </view>
-          <view class="index--item brand-tab-class sk-transparent sk-text-26-9231-419 sk-text" data-index="1" data-item="[object Object]" id="12d36c89--active1">
-            通用工具
-          </view>
-          <view class="index--item brand-tab-class sk-transparent sk-text-26-9231-758 sk-text" data-index="2" data-item="[object Object]" id="12d36c89--active2">
-            消防系列
-          </view>
-          <view class="index--item brand-tab-class sk-transparent sk-text-26-9231-76 sk-text" data-index="3" data-item="[object Object]" id="12d36c89--active3">
-            给水系列
-          </view>
-        </view>
-      </scroll-view>
-    </view>
-    <view is="components/Yl_FloatingButton/index">
-      <view class="FloatingButton-index--float-box" style="top: 550px; left: 345px;">
-        <view>
-          <text class="corner-mark sk-transparent sk-text-14-2857-466 sk-text">99+</text>
-          <image data-title="新建线索" style="width: 80px; height: 80px; transform: translate(-50%,-50%);" class="sk-image"></image>
-        </view>
-      </view>
-    </view>
-    <view class="division"></view>
-    <view is="components/Yl_ListBox/index" id="ListBox">
-      <scroll-view scroll-y="true" class="ListBox-index--scroll-view" refresher-enabled="true" style="height: 597px;">
-        <view is="packageA/market/modules/list/index">
-          <navigator class="list-index--product">
-            <view class="list-index--image-box">
-              <view is="miniprogram_npm/@vant/weapp/image/index">
-                <view class=" van-image image-index--van-image" style="width:100%;height:100%">
-                  <image class="van-image__img image-index--van-image__img sk-image" mode="aspectFill" lazy-load="true"></image>
-                </view>
-              </view>
-            </view>
-            <view class="list-index--right-box">
-              <view class="list-index--title list-index--line-1 sk-transparent sk-text-15-0000-730 sk-text">紫铜管</view>
-              <view class="list-index--type list-index--line-1 sk-transparent sk-text-14-7059-455 sk-text">4333</view>
-              <view class="list-index--tags">
-                <view style="background: #FF3B30;" class="sk-transparent sk-text-18-7500-658 sk-text">
-                  欧标
-                </view>
-                <view style="background: #FA8C16;" class="sk-transparent sk-text-18-7500-74 sk-text">
-                  班尼戈
-                </view>
-              </view>
-              <view class="list-index--price">
-                <view class="sk-transparent sk-text-14-2857-655 sk-text">
-                  ¥ 1100.00~2356.12
-                </view>
-                <text class="sk-transparent sk-text-14-2857-908 sk-text">× 个</text>
-              </view>
-            </view>
-          </navigator>
-          <navigator class="list-index--product">
-            <view class="list-index--image-box">
-              <view is="miniprogram_npm/@vant/weapp/image/index">
-                <view class=" van-image image-index--van-image" style="width:100%;height:100%">
-                  <image class="van-image__img image-index--van-image__img sk-image" mode="aspectFill" lazy-load="true"></image>
-                </view>
-              </view>
-            </view>
-            <view class="list-index--right-box">
-              <view class="list-index--title list-index--line-1 sk-transparent sk-text-15-0000-419 sk-text">阀门</view>
-              <view class="list-index--type list-index--line-1 sk-transparent sk-text-14-7059-512 sk-text">20020908</view>
-              <view class="list-index--tags">
-                <view style="background: #FF3B30;" class="sk-transparent sk-text-18-7500-128 sk-text">
-                  欧标
-                </view>
-                <view style="background: #FA8C16;" class="sk-transparent sk-text-18-7500-578 sk-text">
-                  班尼戈
-                </view>
-              </view>
-              <view class="list-index--price">
-                <view class="sk-transparent sk-text-14-2857-217 sk-text">
-                  ¥ 1100.00~2356.12
-                </view>
-                <text class="sk-transparent sk-text-14-2857-919 sk-text">× 个</text>
-              </view>
-            </view>
-          </navigator>
-          <navigator class="list-index--product">
-            <view class="list-index--image-box">
-              <view is="miniprogram_npm/@vant/weapp/image/index">
-                <view class=" van-image image-index--van-image" style="width:100%;height:100%">
-                  <image class="van-image__img image-index--van-image__img sk-image" mode="aspectFill" lazy-load="true"></image>
-                </view>
-              </view>
-            </view>
-            <view class="list-index--right-box">
-              <view class="list-index--title list-index--line-1 sk-transparent sk-text-15-0000-665 sk-text">紫铜覆塑管</view>
-              <view class="list-index--type list-index--line-1 sk-transparent sk-text-14-7059-7 sk-text">CMCULP 0150001</view>
-              <view class="list-index--tags">
-                <view style="background: #FF3B30;" class="sk-transparent sk-text-18-7500-370 sk-text">
-                  欧标
-                </view>
-                <view style="background: #FA8C16;" class="sk-transparent sk-text-18-7500-637 sk-text">
-                  班尼戈
-                </view>
-              </view>
-              <view class="list-index--price">
-                <view class="sk-transparent sk-text-14-2857-960 sk-text">
-                  ¥ 1100.00~2356.12
-                </view>
-                <text class="sk-transparent sk-text-14-2857-4 sk-text">× 个</text>
-              </view>
-            </view>
-          </navigator>
-          <navigator class="list-index--product">
-            <view class="list-index--image-box">
-              <view is="miniprogram_npm/@vant/weapp/image/index">
-                <view class=" van-image image-index--van-image" style="width:100%;height:100%">
-                  <image class="van-image__img image-index--van-image__img sk-image" mode="aspectFill" lazy-load="true"></image>
-                </view>
-              </view>
-            </view>
-            <view class="list-index--right-box">
-              <view class="list-index--title list-index--line-1 sk-transparent sk-text-15-0000-103 sk-text">铜本色等径直通</view>
-              <view class="list-index--type list-index--line-1 sk-transparent sk-text-14-7059-98 sk-text">BM8270 0150000</view>
-              <view class="list-index--tags">
-                <view style="background: #FF3B30;" class="sk-transparent sk-text-18-7500-933 sk-text">
-                  欧标
-                </view>
-                <view style="background: #FA8C16;" class="sk-transparent sk-text-18-7500-51 sk-text">
-                  班尼戈
-                </view>
-              </view>
-              <view class="list-index--price">
-                <view class="sk-transparent sk-text-14-2857-831 sk-text">
-                  ¥ 1100.00~2356.12
-                </view>
-                <text class="sk-transparent sk-text-14-2857-836 sk-text">× 个</text>
-              </view>
-            </view>
-          </navigator>
-          <navigator class="list-index--product">
-            <view class="list-index--image-box">
-              <view is="miniprogram_npm/@vant/weapp/image/index">
-                <view class=" van-image image-index--van-image" style="width:100%;height:100%">
-                  <image class="van-image__img image-index--van-image__img sk-image" mode="aspectFill" lazy-load="true"></image>
-                </view>
-              </view>
-            </view>
-            <view class="list-index--right-box">
-              <view class="list-index--title list-index--line-1 sk-transparent sk-text-15-0000-887 sk-text">变频节压器</view>
-              <view class="list-index--type list-index--line-1 sk-transparent sk-text-14-7059-723 sk-text">001</view>
-              <view class="list-index--tags">
-                <view style="background: #FF3B30;" class="sk-transparent sk-text-18-7500-88 sk-text">
-                  欧标
-                </view>
-                <view style="background: #FA8C16;" class="sk-transparent sk-text-18-7500-80 sk-text">
-                  班尼戈
-                </view>
-              </view>
-              <view class="list-index--price">
-                <view class="sk-transparent sk-text-14-2857-873 sk-text">
-                  ¥ 1100.00~2356.12
-                </view>
-                <text class="sk-transparent sk-text-14-2857-777 sk-text">× 厘米</text>
-              </view>
-            </view>
-          </navigator>
-          <navigator class="list-index--product">
-            <view class="list-index--image-box">
-              <view is="miniprogram_npm/@vant/weapp/image/index"></view>
-            </view>
-            <view class="list-index--right-box">
-              <view class="list-index--title list-index--line-1 sk-transparent sk-text-15-0000-913 sk-text">大萨达</view>
-              <view class="list-index--type list-index--line-1 sk-transparent sk-text-14-7059-485 sk-text">25665589</view>
-            </view>
-          </navigator>
-        </view>
-      </scroll-view>
-    </view>
-  </view>
-</template>

+ 0 - 234
packageA/market/index.skeleton.wxss

@@ -1,234 +0,0 @@
-/*
-此文件为开发者工具生成,生成时间: 2022/12/23下午1:47:07
-
-在 E:\云链项目\e-wechat\packageA\market\index.wxss 中引入样式
-```
-@import "./index.skeleton.wxss";
-```
-
-更多详细信息可以参考文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/skeleton.html
-*/
-.sk-transparent {
-    color: transparent !important;
-  }
-.sk-text-26-9231-854 {
-    background-image: linear-gradient(transparent 26.9231%, #EEEEEE 0%, #EEEEEE 73.0769%, transparent 0%) !important;
-    background-size: 100% 52.0000rpx;
-    position: relative !important;
-  }
-.sk-text {
-    background-origin: content-box !important;
-    background-clip: content-box !important;
-    background-color: transparent !important;
-    color: transparent !important;
-    background-repeat: repeat-y !important;
-  }
-.sk-text-26-9231-720 {
-    background-image: linear-gradient(transparent 26.9231%, #EEEEEE 0%, #EEEEEE 73.0769%, transparent 0%) !important;
-    background-size: 100% 52.0000rpx;
-    position: relative !important;
-  }
-.sk-text-26-9231-419 {
-    background-image: linear-gradient(transparent 26.9231%, #EEEEEE 0%, #EEEEEE 73.0769%, transparent 0%) !important;
-    background-size: 100% 52.0000rpx;
-    position: relative !important;
-  }
-.sk-text-26-9231-758 {
-    background-image: linear-gradient(transparent 26.9231%, #EEEEEE 0%, #EEEEEE 73.0769%, transparent 0%) !important;
-    background-size: 100% 52.0000rpx;
-    position: relative !important;
-  }
-.sk-text-26-9231-76 {
-    background-image: linear-gradient(transparent 26.9231%, #EEEEEE 0%, #EEEEEE 73.0769%, transparent 0%) !important;
-    background-size: 100% 52.0000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-466 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 28.0000rpx;
-    position: absolute !important;
-  }
-.sk-text-15-0000-730 {
-    background-image: linear-gradient(transparent 15.0000%, #EEEEEE 0%, #EEEEEE 85.0000%, transparent 0%) !important;
-    background-size: 100% 40.0000rpx;
-    position: relative !important;
-  }
-.sk-text-14-7059-455 {
-    background-image: linear-gradient(transparent 14.7059%, #EEEEEE 0%, #EEEEEE 85.2941%, transparent 0%) !important;
-    background-size: 100% 34.0000rpx;
-    position: relative !important;
-  }
-.sk-text-18-7500-658 {
-    background-image: linear-gradient(transparent 18.7500%, #EEEEEE 0%, #EEEEEE 81.2500%, transparent 0%) !important;
-    background-size: 100% 32.0000rpx;
-    position: relative !important;
-  }
-.sk-text-18-7500-74 {
-    background-image: linear-gradient(transparent 18.7500%, #EEEEEE 0%, #EEEEEE 81.2500%, transparent 0%) !important;
-    background-size: 100% 32.0000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-655 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 39.2000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-908 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 33.6000rpx;
-    position: relative !important;
-  }
-.sk-text-15-0000-419 {
-    background-image: linear-gradient(transparent 15.0000%, #EEEEEE 0%, #EEEEEE 85.0000%, transparent 0%) !important;
-    background-size: 100% 40.0000rpx;
-    position: relative !important;
-  }
-.sk-text-14-7059-512 {
-    background-image: linear-gradient(transparent 14.7059%, #EEEEEE 0%, #EEEEEE 85.2941%, transparent 0%) !important;
-    background-size: 100% 34.0000rpx;
-    position: relative !important;
-  }
-.sk-text-18-7500-128 {
-    background-image: linear-gradient(transparent 18.7500%, #EEEEEE 0%, #EEEEEE 81.2500%, transparent 0%) !important;
-    background-size: 100% 32.0000rpx;
-    position: relative !important;
-  }
-.sk-text-18-7500-578 {
-    background-image: linear-gradient(transparent 18.7500%, #EEEEEE 0%, #EEEEEE 81.2500%, transparent 0%) !important;
-    background-size: 100% 32.0000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-217 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 39.2000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-919 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 33.6000rpx;
-    position: relative !important;
-  }
-.sk-text-15-0000-665 {
-    background-image: linear-gradient(transparent 15.0000%, #EEEEEE 0%, #EEEEEE 85.0000%, transparent 0%) !important;
-    background-size: 100% 40.0000rpx;
-    position: relative !important;
-  }
-.sk-text-14-7059-7 {
-    background-image: linear-gradient(transparent 14.7059%, #EEEEEE 0%, #EEEEEE 85.2941%, transparent 0%) !important;
-    background-size: 100% 34.0000rpx;
-    position: relative !important;
-  }
-.sk-text-18-7500-370 {
-    background-image: linear-gradient(transparent 18.7500%, #EEEEEE 0%, #EEEEEE 81.2500%, transparent 0%) !important;
-    background-size: 100% 32.0000rpx;
-    position: relative !important;
-  }
-.sk-text-18-7500-637 {
-    background-image: linear-gradient(transparent 18.7500%, #EEEEEE 0%, #EEEEEE 81.2500%, transparent 0%) !important;
-    background-size: 100% 32.0000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-960 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 39.2000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-4 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 33.6000rpx;
-    position: relative !important;
-  }
-.sk-text-15-0000-103 {
-    background-image: linear-gradient(transparent 15.0000%, #EEEEEE 0%, #EEEEEE 85.0000%, transparent 0%) !important;
-    background-size: 100% 40.0000rpx;
-    position: relative !important;
-  }
-.sk-text-14-7059-98 {
-    background-image: linear-gradient(transparent 14.7059%, #EEEEEE 0%, #EEEEEE 85.2941%, transparent 0%) !important;
-    background-size: 100% 34.0000rpx;
-    position: relative !important;
-  }
-.sk-text-18-7500-933 {
-    background-image: linear-gradient(transparent 18.7500%, #EEEEEE 0%, #EEEEEE 81.2500%, transparent 0%) !important;
-    background-size: 100% 32.0000rpx;
-    position: relative !important;
-  }
-.sk-text-18-7500-51 {
-    background-image: linear-gradient(transparent 18.7500%, #EEEEEE 0%, #EEEEEE 81.2500%, transparent 0%) !important;
-    background-size: 100% 32.0000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-831 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 39.2000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-836 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 33.6000rpx;
-    position: relative !important;
-  }
-.sk-text-15-0000-887 {
-    background-image: linear-gradient(transparent 15.0000%, #EEEEEE 0%, #EEEEEE 85.0000%, transparent 0%) !important;
-    background-size: 100% 40.0000rpx;
-    position: relative !important;
-  }
-.sk-text-14-7059-723 {
-    background-image: linear-gradient(transparent 14.7059%, #EEEEEE 0%, #EEEEEE 85.2941%, transparent 0%) !important;
-    background-size: 100% 34.0000rpx;
-    position: relative !important;
-  }
-.sk-text-18-7500-88 {
-    background-image: linear-gradient(transparent 18.7500%, #EEEEEE 0%, #EEEEEE 81.2500%, transparent 0%) !important;
-    background-size: 100% 32.0000rpx;
-    position: relative !important;
-  }
-.sk-text-18-7500-80 {
-    background-image: linear-gradient(transparent 18.7500%, #EEEEEE 0%, #EEEEEE 81.2500%, transparent 0%) !important;
-    background-size: 100% 32.0000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-873 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 39.2000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-777 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 33.6000rpx;
-    position: relative !important;
-  }
-.sk-text-15-0000-913 {
-    background-image: linear-gradient(transparent 15.0000%, #EEEEEE 0%, #EEEEEE 85.0000%, transparent 0%) !important;
-    background-size: 100% 40.0000rpx;
-    position: relative !important;
-  }
-.sk-text-14-7059-485 {
-    background-image: linear-gradient(transparent 14.7059%, #EEEEEE 0%, #EEEEEE 85.2941%, transparent 0%) !important;
-    background-size: 100% 34.0000rpx;
-    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;
-    top: 0;
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-    background-color: transparent;
-  }

+ 0 - 26
packageA/market/index.wxml

@@ -1,26 +0,0 @@
-<!-- 骨架屏 -->
-<import src="./index.skeleton.wxml" />
-<template is="skeleton" wx:if="{{loading}}" />
-<Yl_HeadNav styleType="1" sort='{{content.sort}}' bindonSearch="onSearch" />
-<view class="role" wx:if="{{userrole=='业务员'}}">
-	<van-cell title-width='95' title="经销商/客户:" custom-class='cell' title-class='title-value' value-class='cell-value' is-link value="{{buttonText||'前去选择'}}" bindtap="selsectedRole" />
-	<view style="height: 8rpx; background-color: #fff;" />
-	<view wx:if="{{buttonText}}" class="clear" catchtap='onCleaRole'>
-		<van-icon name="clear" />
-	</view>
-</view>
-<!-- 领域列表 -->
-<Tabs list="{{tradefieList}}" wx:if="{{tradefieList.length>1}}" box-class='brand-box' tab-class='brand-tab-class' active-class='brand-active-class' name='tradefield' bind:onChange="tradefieChange" />
-<!-- 品牌列表 -->
-<!-- <Tabs list="{{brandList}}" wx:if="{{brandList.length>1}}" box-class='brand-box' tab-class='brand-tab-class' active-class='brand-active-class' bind:onChange="brandChange" /> -->
-<!-- 产品列表 -->
-<Tabs wx:for="{{typeList}}" active="{{item.active}}" wx:key="{{index}}" rowIndex="{{index}}" list="{{item.list}}" bind:onChange="typeChange" name='itemclassname' box-class='brand-box' tab-class='brand-tab-class' active-class='brand-active-class' />
-<view class="division" />
-<Yl_ListBox id='ListBox' bind:getlist='getList'>
-	<List list="{{list}}" sys_enterpriseid='{{sys_enterpriseid}}' />
-	<view wx:if="{{userrole=='业务员'}}" style="height: 80rpx;" />
-</Yl_ListBox>
-<!-- 筛选条件 -->
-<Yl_Filtrate id='Filtrate' list="{{filter}}" bind:handle="handleFilter" dateRange='{{false}}' />
-<!-- 购物车按钮 -->
-<Float wx:if="{{userrole!='业务员'}}" id="Float" pageType="{{istool==0?'Standard':'Tool'}}" />

+ 0 - 20
packageA/market/modules/list/index.js

@@ -1,20 +0,0 @@
-Component({
-  properties: {
-    list: Array,
-    sys_enterpriseid: String
-  },
-  methods: {
-    toDetail(e) {
-      const {
-        item
-      } = e.currentTarget.dataset;
-      wx.navigateTo({
-        url: `/packageA/market/detail?params=${JSON.stringify({
-          sa_itemgroupid:item.sa_itemgroupid,
-          sa_brandid:item.sa_brandid,
-          sys_enterpriseid:this.data.sys_enterpriseid
-        })}`,
-      })
-    }
-  }
-})

+ 0 - 4
packageA/market/modules/list/index.json

@@ -1,4 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {}
-}

+ 0 - 98
packageA/market/modules/list/index.scss

@@ -1,98 +0,0 @@
-.product {
-	display: flex;
-	width: 100vw;
-	padding: 20rpx 30rpx;
-	background: #fff;
-	border-bottom: 1rpx solid #ddd;
-	box-sizing: border-box;
-	overflow: hidden;
-
-	.image-box {
-		font-size: 0;
-		width: 176rpx;
-		height: 176rpx;
-		border-radius: 16rpx;
-		overflow: hidden;
-		margin-right: 30rpx;
-		flex-shrink: 0;
-
-		.text {
-			display: inline-block;
-			width: 176rpx;
-			height: 176rpx;
-			line-height: 172rpx;
-			font-size: 24rpx;
-			text-align: center;
-			color: #666;
-			border: 1rpx solid #ddd;
-			border-radius: 16rpx;
-			box-sizing: border-box;
-		}
-	}
-
-	.right-box {
-		width: 480rpx;
-
-		.title {
-			height: 40rpx;
-			line-height: 40rpx;
-			font-size: 28rpx;
-			font-weight: 600;
-			color: #333333;
-		}
-
-		.type {
-			height: 34rpx;
-			line-height: 34rpx;
-			font-size: 24rpx;
-			color: #888888;
-			margin-top: 8rpx;
-		}
-
-		.tags {
-			display: flex;
-			height: 32rpx;
-			margin-top: 8rpx;
-			width: 100%;
-
-			>view {
-				flex-shrink: 0;
-				height: 32rpx;
-				line-height: 32rpx;
-				padding: 0 10rpx;
-				font-size: 20rpx;
-				color: #FFFFFF;
-				margin-right: 8rpx;
-				border-radius: 6rpx;
-			}
-		}
-
-		.price {
-			display: flex;
-			width: 100%;
-			height: 40rpx;
-			align-items: center;
-			justify-content: space-between;
-			margin-top: 14rpx;
-
-			view {
-				font-size: 28rpx;
-				font-family: PingFang SC-Medium, PingFang SC;
-				font-weight: 550;
-				color: #3874F6;
-			}
-
-			text {
-				font-size: 24rpx;
-				color: #888888;
-			}
-		}
-	}
-}
-
-.line-1 {
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	word-break: break-all;
-}

+ 0 - 31
packageA/market/modules/list/index.wxml

@@ -1,31 +0,0 @@
-<navigator class="product" bindtap="toDetail" data-item="{{item}}" url="#" wx:for="{{list}}" wx:key="index">
-	<view class="image-box">
-		<van-image width="100%" wx:if="{{item.attinfos[0]||item.cover}}" height="100%" fit="cover" src="{{item.attinfos[0].subfiles[0].url||item.attinfos[0].url||item.cover}}" use-loading-slot use-error-slot lazy-load>
-			<van-loading slot="loading" type="spinner" size="20" vertical />
-			<text slot="error">加载失败</text>
-		</van-image>
-		<van-image wx:else width="100%" height="100%" fit="cover" src="https://nb32663.obs.cn-east-2.myhuaweicloud.com:443/202302271677472008916B382a8d8b.jpg" use-loading-slot use-error-slot lazy-load>
-			<van-loading slot="loading" type="spinner" size="20" vertical />
-			<text slot="error">加载失败</text>
-		</van-image>
-	</view>
-	<view class="right-box">
-		<view class="title line-1">{{item.groupname||'--'}}</view>
-		<view class="type line-1">{{item.groupnum||'--'}}</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="price">
-			<view>
-				¥ {{item.minprice}}~{{item.maxprice}}
-			</view>
-			<text>× {{item.unitname}}</text>
-		</view>
-	</view>
-</navigator>
-<Yl_Empty wx:if="{{list.length === 0}}" />

+ 0 - 52
packageA/market/modules/tabs/index.js

@@ -1,52 +0,0 @@
-Component({
-  properties: {
-    list: Array,
-    name: {
-      type: String,
-      value: "brandname"
-    },
-    active: {
-      type: String,
-      value: 0
-    },
-    rowIndex: {
-      type: Number,
-      value: 0
-    },
-    onChange: Function
-  },
-  externalClasses: [
-    "box-class", "tab-class", "active-class"
-  ],
-  data: {
-    scrollLeft: 0,
-  },
-  methods: {
-    onClick(e) {
-      const {
-        index,
-        item
-      } = e.currentTarget.dataset;
-      if (this.data.active != index) {
-        this.setData({
-          active: index
-        });
-        this.triggerEvent("onChange", {
-          item,
-          index,
-          rowIndex: this.data.rowIndex
-        })
-        this.setActive(index);
-      }
-    },
-    setActive(active) {
-      const that = this,
-        query = wx.createSelectorQuery().in(this)
-      query.select('#active' + active).boundingClientRect(function (res) {
-        that.setData({
-          scrollLeft: res.right - res.width
-        })
-      }).exec();
-    },
-  }
-})

+ 0 - 4
packageA/market/modules/tabs/index.json

@@ -1,4 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {}
-}

+ 0 - 16
packageA/market/modules/tabs/index.scss

@@ -1,16 +0,0 @@
-.scroll-box {
-	background-color: #fff;
-	.box {
-		display: flex;
-		min-width: 100vw;
-
-		.item {
-			flex-shrink: 0;
-			padding: 0 20rpx;
-		}
-
-		.active {
-			color: var(--assist);
-		}
-	}
-}

+ 0 - 7
packageA/market/modules/tabs/index.wxml

@@ -1,7 +0,0 @@
-<scroll-view class="scroll-box" scroll-x scroll-left='{{scrollLeft}}' scroll-with-animation enable-passive enhanced show-scrollbar='{{false}}'>
-	<view class="box box-class">
-		<view wx:for="{{list}}" class="item tab-class {{active==index?'active active-class':''}}" id='{{"active"+index}}' wx:key="index" data-item="{{item}}" data-index="{{index}}" bindtap="onClick">
-			{{item[name]}}
-		</view>
-	</view>
-</scroll-view>