地图

machineAndCell/map/map.css

@@ -0,0 +1,60 @@
+.cover-box{
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom:0;
+	height: 134rpx;
+	background: #FFFFFF;
+	border-radius: 0rpx 0rpx 0rpx 0rpx;
+	opacity: 1;
+}
+.cover-icon{
+	width: 48rpx;
+	height: 48rpx;
+	margin-right: 23rpx;
+}
+.dingwei{
+	width: 80rpx;
+	height: 80rpx;
+	background: #FFFFFF;
+	box-shadow: 0rpx 8rpx 40rpx 1rpx rgba(32,32,32,0.06);
+	opacity: 1;
+	border: 1rpx solid rgba(0,0,0,0);
+	position: fixed;
+	bottom:230rpx;
+	left:30rpx;
+	border-radius: 100%;
+}
+.dingwei image{
+	width: 48rpx;
+	height: 48rpx;
+	margin: auto;
+}
+
+.info-card{
+	position: fixed;
+	top: 30rpx;
+	left: 30rpx;
+	right: 30rpx;
+	padding: 32rpx 41rpx;
+	background: #FFFFFF;
+	box-shadow: 0rpx 0rpx 40rpx 1rpx rgba(51,51,51,0.06);
+	border-radius: 10rpx 10rpx 10rpx 10rpx;
+	opacity: 1;
+	line-height: 36rpx;
+	font-weight: 500;
+	color: #333333;
+	font-size: 24rpx;
+}
+.info-card-title{
+	font-size: 28rpx;
+	font-weight: bold;
+	color: #242323;
+	line-height: 41rpx;
+}
+.info-card-item{
+	margin: 20rpx 0;
+}
+.info-card-item-right{
+	text-align: right;
+}

machineAndCell/map/map.vue

@@ -0,0 +1,251 @@
+<template>
+	<view>
+		<map id="map" style="width: 100%; height: 100vh;" :layer-style='5' :show-location='true' :latitude="latitude"
+			:longitude="longitude" :markers="marker" :scale="scale" @markertap="markertap"
+			@callouttap='callouttap'></map>
+		<view class="cover-box ddflex">
+			<view style="justify-content: center;" class="ddflex fflex">
+				<image class="cover-icon" src="../static/images/baojing.png"></image>
+				<view>报警</view>
+			</view>
+			<view style="justify-content: center;" class="ddflex fflex">
+				<image class="cover-icon" src="../static/images/daohang.png"></image>
+				<view>导航</view>
+			</view>
+		</view>
+		<view class="dingwei ddflex" @click="toLocation">
+			<image src="../static/images/dingwei.png"></image>
+		</view>
+		<view class="info-card">
+			<view class="info-card-title">
+				GPS
+			</view>
+			<view class="ddflex info-card-item">
+				<view class="fflex">
+					名称: ZX03D209685
+				</view>
+				<view class="fflex info-card-item-right">
+					状态：静止(30秒)
+				</view>
+			</view>
+			<view class="ddflex info-card-item">
+				<view class="fflex">
+					编号: 016881209685
+				</view>
+				<view class="fflex info-card-item-right">
+					设防状态：撤防
+				</view>
+			</view>
+			<view class="ddflex info-card-item">
+				<view class="fflex">
+					控制: 已通电
+				</view>
+				<view class="fflex info-card-item-right">
+					定位类型：LBS
+				</view>
+			</view>
+			<view class="ddflex info-card-item">
+				<view class="fflex">
+					电压: 66.99V(主电接通)
+				</view>
+			</view>
+			<view class="ddflex info-card-item">
+				<view class="fflex">
+					通信: 2023-04-0311:08:16
+				</view>
+			</view>
+			<view class="ddflex info-card-item">
+				<view class="fflex">
+					定位: 2023-04-03 11:07:46
+				</view>
+			</view>
+			<view class="ddflex info-card-item">
+				<view class="fflex">
+					地址：广东省东莞市兴育路东一街2号
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	const app = getApp();
+	const req = require("../../utils/request.js");
+
+	export default {
+		components: {},
+		props: {},
+		data() {
+			return {
+				map:null,
+				latitude: 23.106574, //纬度
+				longitude: 113.324587, //经度
+				scale: 13, //缩放级别
+				marker: [{
+						id: 0,
+						latitude: 23.13065, //纬度
+						longitude: 113.3274, //经度
+						iconPath: '', //显示的图标        
+						rotate: 0, // 旋转度数
+						width: 20, //宽
+						height: 30, //高
+						//   title:'我在这里',//标注点名
+						alpha: 0.5, //透明度
+						callout: { //自定义标记点上方的气泡窗口 点击有效  
+							content: '天宝大厦', //文本
+							color: '#ffffff', //文字颜色
+							fontSize: 14, //文本大小
+							borderRadius: 15, //边框圆角
+							borderWidth: '10',
+							bgColor: '#e51860', //背景颜色
+							display: 'ALWAYS', //常显
+						},
+					},
+					{
+						id: 1234597,
+						latitude: 23.106574, //纬度
+						longitude: 113.324587, //经度
+						iconPath: '', //显示的图标        
+						rotate: 0, // 旋转度数
+						width: 20, //宽
+						height: 30, //高
+						//  title:'我在这里',//标注点名
+						alpha: 0.5, //透明度
+						//      label:{//为标记点旁边增加标签   //因背景颜色H5不支持
+						//   color:'red',//文本颜色
+						//      },
+						callout: { //自定义标记点上方的气泡窗口 点击有效  
+							content: '广州塔', //文本
+							color: '#ffffff', //文字颜色
+							fontSize: 14, //文本大小
+							borderRadius: 15, //边框圆角
+							borderWidth: '10',
+							bgColor: '#e51860', //背景颜色
+							display: 'ALWAYS', //常显
+						},
+					},
+					{
+						id: 2,
+						latitude: 23.1338, //纬度
+						longitude: 113.33052, //经度
+						iconPath: '', //显示的图标        
+						rotate: 0, // 旋转度数
+						width: 20, //宽
+						height: 30, //高
+						alpha: 0.5, //透明度
+						callout: { //自定义标记点上方的气泡窗口 点击有效  
+							content: '德隆大厦', //文本
+							color: '#ffffff', //文字颜色
+							fontSize: 14, //文本大小
+							borderRadius: 15, //边框圆角
+							borderWidth: '10',
+							bgColor: '#e51860', //背景颜色
+							display: 'ALWAYS', //常显
+						},
+					},
+					{
+						id: 3,
+						latitude: 23.136455, //纬度
+						longitude: 113.329002, //经度
+						iconPath: '', //显示的图标        
+						rotate: 0, // 旋转度数
+						width: 20, //宽
+						height: 30, //高
+						alpha: 0.5, //透明度
+						callout: { //自定义标记点上方的气泡窗口 点击有效  
+							content: '羊城国际商贸中心', //文本
+							color: '#ffffff', //文字颜色
+							fontSize: 14, //文本大小
+							borderRadius: 15, //边框圆角
+							borderWidth: '10',
+							bgColor: '#e51860', //背景颜色
+							display: 'ALWAYS', //常显
+						},
+					},
+					{
+						id: 4,
+						latitude: 23.224781, //纬度
+						longitude: 113.293911, //经度
+						iconPath: '', //显示的图标        
+						rotate: 0, // 旋转度数
+						width: 20, //宽
+						height: 30, //高
+						alpha: 0.5, //透明度
+						callout: { //自定义标记点上方的气泡窗口 点击有效  
+							content: '天瑞广场A座', //文本
+							color: '#ffffff', //文字颜色
+							fontSize: 16, //文本大小
+							borderRadius: 15, //边框圆角
+							borderWidth: '12',
+							bgColor: '#e51860', //背景颜色
+							display: 'ALWAYS', //常显
+						},
+					},
+					{
+						id: 5,
+						latitude: 23.072726, //纬度
+						longitude: 113.277921, //经度
+						iconPath: '', //显示的图标        
+						rotate: 0, // 旋转度数
+						width: 20, //宽
+						height: 30, //高
+						alpha: 0.5, //透明度
+						callout: { //自定义标记点上方的气泡窗口 点击有效  
+							content: '大米和小米儿童康复(广州盈丰)中心', //文本
+							color: '#ffffff', //文字颜色
+							fontSize: 14, //文本大小
+							borderRadius: 15, //边框圆角
+							borderWidth: '8',
+							bgColor: '#e51860', //背景颜色
+							display: 'ALWAYS', //常显
+						},
+					},
+				],
+
+
+			}
+		},
+		onLoad(options) {
+
+		},
+		onShow() {
+
+		},
+		onReady() {
+			
+		},
+		mounted(){
+		},
+		computed: {},
+		methods: {
+			//地图点击事件
+			markertap(e) {
+				console.log("===你点击了标记点===", e)
+			},
+			//地图点击事件
+			callouttap(e) {
+				console.log('地图点击事件', e)
+			},
+			toLocation() {
+				console.log('地图控件回到原位');
+				req.getLocation((res) =>{
+						console.log('当前位置：' ,res);
+						console.log('当前位置的经度：' + res.longitude);
+						console.log('当前位置的纬度：' + res.latitude);
+						this.longitude = res.longitude;
+						this.latitude = res.latitude;
+						this.map = uni.createMapContext("map", this);
+						this.map.moveToLocation()
+					})
+			}
+		},
+		mounted() {
+
+		},
+		onPageScroll: function(e) {}
+	}
+</script>
+
+<style>
+	@import "./map.css";
+</style>

mine/collect/collect.css

@@ -1,12 +0,0 @@
-/* mine/collect/collect.wxss */
-.list{background: #fff;padding: 0 20rpx;margin: 20rpx 0 0;}
-.list .li{display: flex;display: -webkit-flex;align-items: center;padding: 30rpx 10rpx;border-bottom: 2rpx solid #f5f5f5;}
-.list .li:last-child{border-bottom: none;}
-.cimg{width: 180rpx;height: 180rpx;border-radius: 10rpx;margin-right: 30rpx;border: 2rpx solid #E5E5E5;box-sizing: border-box;}
-.zhinfo{flex:1;-webkit-flex: 1;overflow: hidden;position: relative;}
-.zhtit{font-size: 30rpx;color: #333;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;}
-.guige{font-size: 22rpx;color: #999;margin-top: 5rpx;}
-.jiage{display: flex;display: -webkit-flex;align-items: center;justify-content: space-between;margin-top: 55rpx;}
-.zhjia{font-size:28rpx;color: #FE0419;}
-.zhjia text{font-size: 36rpx;}
-.btn{font-size: 22rpx;color: #333;width: 136rpx;height: 46rpx;border-radius: 25rpx;border: 2rpx solid #D2D2D2;text-align: center;line-height: 46rpx;}

mine/collect/collect.vue

@@ -1,117 +0,0 @@
-<template>
-<view>
-<!--mine/collect/collect.wxml-->
-<view class="list" v-if="pageList.length > 0">
-	<view v-for="(item, index) in pageList" :key="index" class="li">
-		<image :src="item.pic" @tap="redirectDetail" :data-id="item.id" mode="aspectFit" class="cimg"></image>
-		<view class="zhinfo">
-			<view class="zhtit" @tap="redirectDetail" :data-id="item.id">{{item.title}}</view>
-			<!-- <view class="guige">规格：15g</view> -->
-			<view class="jiage">
-				<view class="zhjia" @tap="redirectDetail" :data-id="item.id">￥<text>{{item.salePrice}}</text></view>
-				<view class="btn" :data-index="index" @tap="clickCollect">取消收藏</view>
-			</view>
-		</view>
-	</view>
-</view>
-<view class="nodata" v-else>
-  <image :src="picUrlss+'empty_sc.png'"></image>
-  <text>暂无收藏</text>
-</view>
-</view>
-</template>
-
-<script>
-const req = require("../../utils/request.js");
-const app = getApp();
-
-export default {
-  data() {
-    return {
-		picUrlss: req.public.picUrls,
-      form: {
-        page: 1,
-        limit: 10
-      },
-      pageList: [],
-      isLoad: true,
-      ishow: false
-    };
-  },
-
-  components: {},
-  props: {},
-  onLoad: function (options) {
-    this.loadFootprint();
-  },
-
-  onReachBottom() {
-    this.form.page++;
-    this.loadCoupon();
-  },
-
-  methods: {
-    loadFootprint() {
-      let isShowLoading = false;
-
-      if (this.form.page == 1 && !isShowLoading) {
-        req.loadIng('加载中');
-        isShowLoading = true;
-      }
-
-      if (!this.isLoad) return false;
-      this.isLoad = false;
-      let that = this;
-      req.getRequest('/api/collect/product', this.form, data => {
-        if (data && data.length == 10) this.isLoad = true;
-        if (that.form.page > 1) data = that.pageList.concat(data);
-        that.setData({
-          pageList: data
-        });
-
-        if (!this.pageList||this.pageList.length<1) {
-          that.setData({
-            ishow: true
-          });
-        } else {
-          that.setData({
-            ishow: false
-          });
-        }
-
-        if (isShowLoading) {
-          uni.hideLoading();
-          isShowLoading = false;
-        }
-      });
-    },
-
-    clickCollect(event) {
-      let _ts = this;
-
-      const index = event.currentTarget.dataset.index;
-      const page = this.pageList[index];
-      req.postRequest('/api/collect', {
-        bindId: page.id,
-        type: 1
-      }, data => {
-        _ts.pageList.splice(index, 1);
-
-        _ts.setData({
-          pageList: _ts.pageList
-        });
-      });
-    },
-
-    redirectDetail(event) {
-      uni.navigateTo({
-        url: '/product/detail/detail?id=' + event.currentTarget.dataset.id
-      });
-    }
-
-  }
-};
-</script>
-<style>
-@import "./collect.css";
-</style>

mine/comments/comments.css

@@ -1,27 +0,0 @@
-/* mine/comments/comments.wxss */
-page{padding-bottom: 190rpx;}
-.page{overflow: hidden;}
-.spinfo{padding: 30rpx 20rpx;border-bottom: 2rpx solid #eee;overflow: hidden;}
-.spinfo image{width: 108rpx;height: 108rpx;border-radius: 10rpx;border: 2rpx solid #E5E5E5;box-sizing: border-box;margin-right: 20rpx;}
-.spinfo .flex{overflow: hidden;}
-.name{font-size: 30rpx;color: #333;text-overflow: ellipsis;white-space: nowrap;overflow: hidden;}
-.guige{font-size: 22rpx;color: #999;margin-top: 5rpx;align-items: center;}
-.ping{align-items: center;font-size: 28rpx;color: #333;padding: 30rpx 20rpx}
-.star{margin-left: 13rpx;}
-.star image{width: 44rpx;height: 42rpx;margin: 0 17rpx}
-.ping text{display: block;color: #999;margin-left: 13rpx;}
-.pingjia .ping{border-bottom: 2rpx solid #eee;}
-.pingjia .ping:last-child{border-bottom: none;}
-.con{padding: 0 20rpx 40rpx;}
-.tit{font-size: 28rpx;color: #333;padding: 35rpx 0;}
-.text{border: 2rpx solid #DFDFDF;height: 140rpx;border-radius: 6rpx;}
-.text textarea{width: 100%;border: none;padding: 10rpx 15rpx;height: 100rpx;box-sizing: border-box;}
-.text view{padding:  0 15rpx;text-align: right;font-size: 24rpx;color: #B1B1B1;}
-.imgbox{margin-top: 20rpx;}
-.img{margin-right: 20rpx;position: relative;}
-.img image{width: 120rpx;height: 120rpx;border-radius: 10rpx;}
-.img image.cuo{width: 30rpx;height: 30rpx;position: absolute;top: -5rpx;right: -5rpx;}
-.upload image{width: 120rpx;height: 120rpx;border-radius: 10rpx;}
-
-
-.submit{position: fixed;left: 40rpx;right: 40rpx;bottom: 60rpx;background: #F02637;height: 100rpx !important;line-height: 100rpx !important;border-radius: 10rpx !important;font-size: 36rpx;color: #fff;}

mine/comments/comments.vue

@@ -1,366 +0,0 @@
-<template>
-	<view>
-		<!--mine/comments/comments.wxml-->
-		<view class="page pdlr20">
-			<block v-for="(item, index) in products" :key="index">
-				<view class="info bgfff r20 mt20">
-					<view class="spinfo dflex">
-						<image :src="item.pic" mode="aspectFit"></image>
-						<view class="flex">
-							<view class="name">{{item.title}}</view>
-							<view v-if="item.propertiesList" class="guige dflex">规格：
-								<text v-for="(itemGuige, index2) in item.propertiesList" :key="index2" class="guige"
-									decode="true">{{itemGuige.value}}&nbsp;
-								</text>
-							</view>
-						</view>
-					</view>
-					<view class="ping dflex">
-						<view>商品评分</view>
-						<view class="star dflex">
-							<image v-for="(it, idx) in [1, 2, 3, 4, 5]" :key="idx"
-								:src="item.score >= it ? '/static/pages/images/star_h.png' : '/static/pages/images/star.png'"
-								:data-index="index" :data-idx="idx" @tap="addProScores"></image>
-						</view>
-						<text
-							v-if="item.score > 0">{{item.score == 1 ? '非常差' : item.score == 2 ? '差' : item.score == 3 ? '一般' : item.score == 4 ? '好' : '非常好'}}</text>
-					</view>
-				</view>
-				<view class="con bgfff r20 mt20">
-					<view class="tit">产品评价</view>
-					<view class="text">
-						<textarea @input="textareaInput" :data-index="index" :value="item.evaluateText" maxlength="200"
-							name="text"></textarea>
-						<view>0/250</view>
-					</view>
-					<view class="imgbox dflex">
-						<view v-for="(it, idx1) in item.buyShow" :key="idx1" class="img">
-							<image :src="item.buyShow[idx1]" mode="aspectFit"></image>
-							<image src="/mine/static/mine/images/imagecuo.png" class="cuo" @tap="cleanimage"
-								:data-index="index" :data-idx="idx1"></image>
-						</view>
-						<view class="upload" @tap="choiceImages" :data-index="index" v-if="item.buyShow.length<3">
-							<image src="/static/pages/images/upload.png"></image>
-						</view>
-					</view>
-				</view>
-			</block>
-			<view class="pingjia bgfff r20 mt20">
-				<view class="ping dflex">
-					<view>服务态度</view>
-					<view class="star dflex">
-						<image v-for="(it, idx) in [1, 2, 3, 4, 5]" :key="idx"
-							:src="serviceScore >= it ? '/static/pages/images/star_h.png' : '/static/pages/images/star.png'"
-							:data-idx="idx" @tap="addServiceScores"></image>
-					</view>
-					<text
-						v-if="serviceScore > 0">{{serviceScore == 1 ? '非常差' : serviceScore == 2 ? '差' : serviceScore == 3 ? '一般' : serviceScore == 4 ? '好' : '非常好'}}</text>
-				</view>
-			</view>
-		</view>
-
-
-
-		<button class="submit" @tap="updateScore" :disabled="isDisabled">{{isDisabled ? '已评价' : '发表评价'}}</button>
-		
-		<canvas canvas-id="canvas" :style="'width:' + cWidth + 'px;height:' + cHeight +'px;position: absolute;left:-1000px;top:-1000px;'"></canvas>
-	</view>
-</template>
-
-<script>
-	// mine/comments/comments.js
-	const app = getApp();
-	const req = require("../../utils/request.js");
-
-	export default {
-		data() {
-			return {
-				scoreList: [],
-				serviceScore: 0,
-				products: "",
-				cWidth: 0,
-				cHeight: 0
-			};
-		},
-
-		components: {},
-		props: {},
-		onLoad: function(options) {
-			this.id = options.id;
-			let that = this;
-			req.getRequest('/api/order/detail', {
-				id: this.id
-			}, data => {
-				let products = [];
-				data.products.map(it => {
-					it.bindId = it.id;
-					it.bindType = 1;
-					it.score = 5;
-					it.scoreType = 1;
-					it.evaluateText = '';
-					it.buyShow = [];
-					products.push(it);
-				});
-				that.setData({
-					products: products
-				});
-				// console.log('订单详情', this.products);
-			});
-		},
-		onShow: function() {
-			let that = this;
-		},
-		methods: {
-			addProScores(event) {
-				const index = event.currentTarget.dataset.index;
-				const idx = event.currentTarget.dataset.idx;
-				const page = this.products;
-				let d = {};
-				d['products[' + index + '].score'] = parseInt(idx) + 1;
-				this.setData(d);
-			},
-
-			textareaInput(event) {
-				const index = event.currentTarget.dataset.index;
-				let d = {};
-				d['products[' + index + '].evaluateText'] = event.detail.value;
-				this.setData(d);
-			},
-			// req.loadIng("上传中");
-			// req.uploadFile('/api/upload', allList[count].filePath, res => {
-			// 	let avatar = that.products[index].buyShow;
-			// 	let d = {};
-			// 	d['products[' + index + '].buyShow'] = avatar
-			// 		.concat(res.src);
-			// 	that.setData(d);
-			// 	uni.showToast({
-			// 		title: '上传成功',
-			// 		icon: 'success',
-			// 		duration: 2000
-			// 	});
-			// })
-			//上传图片
-		  choiceImages(event) {
-			let that = this;
-			let index = event.currentTarget.dataset.index;
-			let products = that.products[index];
-			wx.chooseImage({
-			  count: 9,
-			  sourceType: ['album', 'camera'],
-			  sizeType: ['compressed'],
-			  async success(res) {
-				console.log(res);
-				let list = res.tempFiles;
-				console.log(list);
-				let allList = [];
-				for (let i = 0; i < list.length; i++) {
-				  //两M
-				  if (list[i].size > 50000) {
-					var path = await that.compressImg(list[i].path)
-					var data = {
-					  formData: {
-						flag: 726
-					  },
-					  filePath: path,
-					  name: 'file'
-					}
-					allList.push(data);
-				  } else {
-					var data = {
-					  formData: {
-						flag: 722
-					  },
-					  filePath: list[i].path,
-					  name: 'file'
-					}
-					allList.push(data);
-				  }
-				}
-				console.log(allList)
-				let successUp = 0;
-				let failUp = 0;
-				let count = 0
-				// 多图上传 allList:图片数组 successUp：上传成功次数 现在上传的下标
-				that.uploadImgs(allList, successUp, failUp, count,products,index);
-			  },
-			  fail(err) {}
-			})
-		  },
-		  //通过canvans缩放长宽来压缩图片 path:图片本地路径  limitNum：压缩到长宽多大
-		  async compressImg(path, multiple = 2, limitNum = 600) {
-			console.log('图片链接',path)
-			let that = this;
-			return new Promise((resolve, reject) => {
-			  wx.getImageInfo({
-				src: path,
-				success(res) {
-				  var canvasWidth = res.width //图片原始长宽
-				  var canvasHeight = res.height
-				  console.log('图片的基本信息', res)
-				  // while循环 保证宽高在100以内 Math.trunc()去掉小数点右边数
-				  while (canvasWidth > limitNum || canvasHeight > limitNum) {
-					canvasWidth = Math.trunc(res.width / multiple)
-					canvasHeight = Math.trunc(res.height / multiple)
-					multiple++
-				  }
-				  //设置画布长宽
-				  that.setData({
-					cWidth: canvasWidth,
-					cHeight: canvasHeight
-				  })
-				  //----------绘制图形并取出图片路径--------------
-				  var ctx = wx.createCanvasContext('canvas')
-				  ctx.drawImage(res.path, 0, 0, canvasWidth, canvasHeight)
-				  ctx.draw(false, setTimeout(() => {
-					wx.canvasToTempFilePath({
-					  canvasId: 'canvas',
-					  destWidth: canvasWidth,
-					  destHeight: canvasHeight,
-					  success: function (res) {
-						console.log(res.tempFilePath) //图片路径
-						resolve(res.tempFilePath)
-					  },
-					  fail: function (res) {
-						console.log(res.errMsg)
-					  }
-					})
-				  }, 100))
-				},
-				fail: function (res) {
-				  console.log(res.errMsg)
-				},
-			  })
-			})
-		  },
-		  //多张图片上传
-		  uploadImgs: function (allList, successUp, failUp, count,products,index) {
-			console.log(allList, successUp, failUp, count)
-			let that = this;
-			let length = allList.length; //总共上传的数量
-			let releaseImageList = products;
-			var promise = Promise.all(allList.map(tempFilePath => {
-				return new Promise(function(resolve, reject) {
-					req.loadIng("上传中");
-					req.uploadFile('/api/upload', tempFilePath.filePath, res => {
-						// console.log(res)
-						let avatar = that.products[index].buyShow;
-						let d = {};
-						d['products[' + index + '].buyShow'] = avatar
-							.concat(res.src);
-						that.setData(d);
-						uni.showToast({
-							title: '上传成功',
-							icon: 'success',
-							duration: 2000
-						});
-					});
-				});
-			}));
-			promise.then(function(results) {
-				// console.log(results);
-			}).catch(function(err) {
-				// console.log(err);
-			});
-			
-		  },
-			uploadImg(event) {
-				let that = this;
-				let index = event.currentTarget.dataset.index;
-				let products = that.products[index];
-				uni.chooseImage({
-					count: products.buyShow.length - 3,
-					sizeType: ['compressed'],
-					sourceType: ['album', 'camera'],
-					crop: {
-						quality: 40
-					},
-					success: function({
-						tempFilePaths
-					}) {
-						var promise = Promise.all(tempFilePaths.map(tempFilePath => {
-							return new Promise(function(resolve, reject) {
-								req.loadIng("上传中");
-								req.uploadFile('/api/upload', tempFilePath, res => {
-									// console.log(res)
-									let avatar = that.products[index].buyShow;
-									let d = {};
-									d['products[' + index + '].buyShow'] = avatar
-										.concat(res.src);
-									that.setData(d);
-									uni.showToast({
-										title: '上传成功',
-										icon: 'success',
-										duration: 2000
-									});
-								});
-							});
-						}));
-						promise.then(function(results) {
-							// console.log(results);
-						}).catch(function(err) {
-							// console.log(err);
-						});
-					}
-				});
-			},
-
-			// 删除图片
-			cleanimage(event) {
-				let index = event.currentTarget.dataset.index;
-				let idx = event.currentTarget.dataset.idx;
-				let arr = this.products[index].buyShow;
-				arr.splice(idx, 1);
-				this.setData({
-					['products[' + index + '].buyShow']: arr
-				});
-			},
-
-			addServiceScores(event) {
-				const index = event.currentTarget.dataset.idx;
-				this.setData({
-					serviceScore: parseInt(index) + 1
-				});
-			},
-
-			updateScore() {
-				if (this.serviceScore == 0) return req.msg('请对服务态度进行评分');
-				let borrow = {
-					uid: req.getStorage('userInfo').id,
-					orderId: this.id,
-					isOpen: 1
-				};
-				let scoreList = this.scoreList;
-				let products = this.products;
-				products.map(item => {
-					scoreList = scoreList.concat({
-						bindId: item.id,
-						bindType: item.bindType,
-						score: item.score,
-						scoreType: item.scoreType,
-						evaluateText: item.evaluateText,
-						buyShow: item.buyShow.length > 0 ? item.buyShow.join(',') : ''
-					});
-				});
-				scoreList = scoreList.concat({
-					bindId: this.id,
-					bindType: 5,
-					score: this.serviceScore,
-					scoreType: 3,
-					evaluateText: '',
-					buyShow: ''
-				});
-				borrow.scoreList = JSON.stringify(scoreList);
-				// console.log(scoreList);
-				req.postRequest('/api/sysScore/save', borrow, () => {
-					req.msg('评分成功', () => {
-						uni.navigateBack();
-					});
-				});
-			}
-
-		}
-	};
-</script>
-<style>
-	@import "./comments.css";
-</style>

mine/coupons/coupons.css

@@ -1,66 +0,0 @@
-/* mine/coupons/coupons.wxss */
-page{padding-bottom: 100rpx;}
-.tab{line-height: 100rpx;font-size: 30rpx;color: #999;text-align: center;}
-.tab .li{width: 50%;position: relative;}
-.tab .li.active{color: #222;font-weight: bold;}
-.tab .li.active::after{content: '';display: block;width: 38rpx;height: 7rpx;background:var(--mina);border-radius: 4rpx;position: absolute;bottom: 0;left: 50%;transform: translateX(-50%);}
-/* .list{padding: 30rpx 20rpx 10rpx;overflow: hidden;}
-.list .li{background: #fff;border-radius: 10rpx;overflow: hidden;border:1px solid rgba(222,222,222,1);margin-bottom: 20rpx;position: relative;}
-.lit{height: 187rpx;position: relative;}
-.lqbg{width: 100%;height: 100%;position: absolute;top: 0;left: 0;z-index: 1;}
-.lits{position: relative;z-index: 2;padding: 30rpx 40rpx 0;}
-.left{font-weight: bold;font-size: 24rpx;color: #fff;font-weight: bold;margin-right: 20rpx;}
-.left text{font-size: 36rpx;font-weight: normal;}
-.left text.jine{font-size: 88rpx;font-weight: bold;}
-.tong{margin-top: 25rpx;}
-.tong view{font-size: 28rpx;color: #fff;margin-bottom: 5rpx;}
-.tong text{font-size: 24rpx;color: #fff;}
-.lqbtn{width: 180rpx;height: 69rpx;background: #fff;border-radius: 35rpx;line-height: 69rpx;font-size: 24rpx;color: #FF6008;text-align: center;margin-top: 25rpx;}
-.right{padding: 15rpx 35rpx 10rpx;font-size: 24rpx;color: #9A9A9A;overflow: hidden;}
-.right view{position: relative;margin-bottom: 10rpx;}
-.right view::before{content: '';display: block;width: 8rpx;height: 8rpx;border-radius: 50%;background: #888;position: absolute;left: -20rpx;top: 50%;transform: translateY(-50%);}
-.list .li.fail .lqbtn{background: #A6A6A6;color: #333;}
-.guoqi{width: 187rpx;height: 165rpx;position: absolute;right: 50rpx;top: 6rpx;z-index: 1;} */
-
-.dflex{align-items: center;}
-.list{padding: 31rpx 30rpx 20rpx;}
-.list .li{background: #fff;box-shadow: 0 0 32rpx rgba(0, 0, 0, 0.04);border-radius: 15rpx;padding: 0 22rpx;color: #999;margin-bottom: 24rpx;position: relative;}
-.info{border-bottom: 1rpx dashed #E9E9E9;padding: 20rpx 22rpx 29rpx 9rpx;position: relative;}
-.info::before,.info::after{content: '';display: block;width: 20rpx;height: 20rpx;background: #f6f6f6;border-radius: 50%;position: absolute;bottom: -10rpx;}
-.info::before{left: -34rpx;}
-.info::after{right: -34rpx;}
-.info-img{width: 80rpx;height: 80rpx;border-radius: 8rpx;margin-right: 15rpx;}
-.title{font-size: 32rpx;color: #222;font-weight: bold;}
-.time{font-size: 22rpx;margin-top: 15rpx;}
-.info-r{text-align: right;margin-left: 20rpx;width: 200rpx;}
-.money{font-size: 60rpx;color: #EB0000;}
-.money text{font-size: 30rpx;}
-.man{font-size: 22rpx;}
-.li-bot{padding: 15rpx 15rpx 15rpx 7rpx;height: 50rpx;}
-.check{font-size: 24rpx;color: #666;}
-.xian{height: 27rpx;background: linear-gradient(90deg, #F9E1B7 0%, #FBDBA4 100%);border-radius: 50rpx;font-size: 18rpx;color: #8A5203;line-height: 27rpx;padding: 0 10rpx;}
-.check image{width: 17rpx;height: 11rpx;margin-left: 8rpx;}
-.ma{width: 38rpx;height: 38rpx;margin-right: 60rpx;}
-.yong{width: 130rpx;height: 50rpx;background: linear-gradient(90deg, #FF213F 0%, #FF5A21 100%);border-radius: 28rpx;font-size: 24rpx;color: #fff;justify-content: center;}
-.yong::after{content: '';display: block;width: 0;height: 0;border: 10rpx solid transparent;border-right: none;border-left-color: #fff;border-radius: 5rpx;margin-left: 8rpx;}
-.infos{font-size: 20rpx;padding: 15rpx 0 30rpx;}
-.infos view{padding: 5rpx 0;}
-.list .li.tong{background: #FF243D;color: #fff;}
-.list .li.tong .info{border-bottom-color: rgba(255,255,255,.3);}
-.list .li.tong .title,.list .li.tong .check,.list .li.tong .money{color: #fff;}
-.list .li.tong .yong{background: linear-gradient(90deg, #FFECD9 0%, #FFB164 100%);color: #D88636;}
-.list .li.tong .yong::after{border-left-color: #D88636;}
-.yi{width: 130rpx;}
-.yipic{width: 144rpx;height: 103rpx;position: absolute;right: 20rpx;bottom: 0;z-index: 2;}
-.list .li.hui{opacity: .7;}
-.i-pro text{margin-right: 20rpx;color: #333;}
-
-.show{display: block;}
-.hide{display: none;}
-.erweima{width: 50rpx; height: 50rpx;}
-.bot{justify-content: space-between;padding: 0 30rpx;align-items: center;}
-.ygq{width: 180rpx;height: 69rpx;background: #A6A6A6;border-radius: 35rpx;line-height: 69rpx;font-size: 24rpx;color: #323232;text-align: center;margin-top: 25rpx;}
-
-.ling{height: 100rpx;background: #FFFFFF;font-size: 30rpx;color: #222;align-items: center;border-radius: 16rpx;margin: 30rpx 30rpx 0;padding: 0 27rpx;}
-.quan-img{width: 40rpx;height: 34rpx;margin-right: 9rpx;}
-.rico{width: 14rpx;height: 21rpx;}

mine/coupons/coupons.vue

@@ -1,236 +0,0 @@
-<template>
-	<view>
-		<!--mine/coupons/coupons.wxml-->
-		<view class="tab bgfff dflex">
-			<view :class="'li ' + (currentTab == 0 ? 'active' : '')" data-current="0" @tap="tab">未使用</view>
-			<view :class="'li ' + (currentTab == 1 ? 'active' : '')" data-current="1" @tap="tab">已使用</view>
-			<view :class="'li ' + (currentTab == 2 ? 'active' : '')" data-current="2" @tap="tab">已失效</view>
-		</view>
-		<navigator url="/product/coupon/coupon" hover-class="none" class="ling ddflex">
-			<image src="../static/mine/images/quan.png" class="quan-img"></image>
-			<view class="fflex">去领券中心</view>
-			<image src="../../static/pages/images/rico.png" class="rico"></image>
-		</navigator>
-		<block v-if="pageList.length > 0">
-			<view class="list">
-				<view :class="'li' + (item.couponType === 3 ? ' tong' : '') + (currentTab == 0 ? '' : ' hui')" v-for="(item, index) in pageList" :key="index">
-					<view class="info dflex">
-						<image :src="item.couponIcon" mode="aspectFill" class="info-img" v-if="item.couponIcon"></image>
-						<view class="flex">
-							<view class="title">{{item.couponType === 3 ? '通用券' : item.couponType === 1 ? '满减券' :  item.couponType === 4 ? '免除券':'代金券'}}-{{item.couponTitle}}</view>
-							<view class="time">有效期至{{item.couponEnd}}</view>
-						</view>
-						<view class="info-r" v-if="item.couponType != 4">
-							<view class="money"><text>￥</text>{{item.couponAmount}}</view>
-							<view class="man">{{item.couponBrief}}</view>
-						</view>
-					</view>
-					<view class="li-bot dflex">
-						<view class="check dflex flex" @click="checks(item,index)">查看详情
-							<!-- <view class="xian">限青岛大虾</view> -->
-							<image src="../static/mine/images/bico1.png" v-if="item.couponType === 3"></image>
-							<image src="../static/mine/images/bico.png" v-else></image>
-						</view>
-						<image :src="'../static/mine/images/' + (item.couponType === 3 ? 'ma_white' : 'ma_dark') + '.png'" class="ma"></image>
-						<view class="yong dflex" @tap="toIndex" v-if="currentTab == 0">去使用</view>
-						<view class="yi" v-else>
-							<image src="../static/mine/images/yishiyong.png" class="yipic" v-if="currentTab == 1"></image>
-							<image src="../static/mine/images/yishixiao.png" class="yipic" v-else></image>
-						</view>
-					</view>
-					<view class="infos" v-if="item.isShow">
-						<view>1.使用时间：{{item.couponStart}}至{{item.couponEnd}}</view>
-						<view v-if="item.couponBrief">2.使用范围：{{item.couponBrief}}</view>
-						<view v-if="item.useActionsList && item.useActionsList.length > 0" class="i-pro">{{item.couponBrief?'3':'2'}}.指定产品：
-							<text v-for="(it,idx) in item.useActionsList" :key="idx" @click="toDetail(it)">{{it.name}}</text>
-						</view>
-					</view>
-				</view>
-			</view>
-		
-			<!-- <view :class="'list ' + (currentTab == 0 ? 'show' : 'hide')">
-				<view v-for="(item, index) in pageList" :key="index" class="li" @tap="toIndex">
-					<view class="lit">
-						<image :src="picUrlss+'yhq_wei.png'" class="lqbg" v-if="item.couponState==1"></image>
-						<image :src="picUrlss+'yiguoqi.png'" class="lqbg"
-							v-if="item.couponState==2||item.couponState==3"></image>
-						<view class="lits dflex">
-							<view class="left"><text>￥</text><text class="jine">{{item.couponAmount}}</text>元</view>
-							<view class="tong flex">
-								<view>{{item.couponType === 1 ? '满减券' : '代金券'}}</view>
-								<text>{{item.couponBrief}}</text>
-							</view>
-							<view class="lqbtn" v-if="item.couponState==1">立即使用</view>
-							<view class="lqbtn" v-if="item.couponState==2">已使用</view>
-							<view class="lqbtn" v-if="item.couponState==3">已过期</view>
-						</view>
-					</view>
-					<view class="dflex bot">
-						<view class="right">
-							<view>使用日期：{{item.couponStart}}至{{item.couponEnd}}</view>
-							<view>适用范围：{{item.couponTitle}}</view>
-						</view>
-						<image src="/static/pages/images/erweima.png" class="erweima" v-if="item.couponState==1">
-						</image>
-						<image src="/static/pages/images/yhq-ygq.png" class="erweima"
-							v-if="item.couponState==2||item.couponState==3"></image>
-					</view>
-				</view>
-			</view>
-			<view :class="'list ' + (currentTab == 1 ? 'show' : 'hide')">
-				<view v-for="(item, index) in pageList" :key="index" class="li fail">
-					<view class="lit">
-						<image :src="picUrlss+'yhq_yi.png'" class="lqbg"></image>
-						<view class="lits dflex">
-							<view class="left"><text>￥</text><text class="jine">{{item.couponAmount}}</text>元</view>
-							<view class="tong flex">
-								<view>{{item.couponType === 1 ? '满减券' : '代金券'}}</view>
-								<text>{{item.couponBrief}}</text>
-							</view>
-						</view>
-					</view>
-					<view class="right">
-						<view>使用日期：{{item.couponStart}}至{{item.couponEnd}}</view>
-						<view>适用范围：{{item.couponTitle}}</view>
-					</view>
-					<image src="/static/pages/images/guoqi.png" class="guoqi"></image>
-				</view>
-			</view> -->
-		</block>
-		<view class="nodata" v-if="ishow">
-			<image :src="picUrlss+'empty_yhq.png'"></image>
-			<text>暂无优惠券</text>
-		</view>
-	</view>
-</template>
-
-<script>
-	// mine/coupons/coupons.js
-	const req = require("../../utils/request.js");
-	const app = getApp();
-
-	export default {
-		data() {
-			return {
-				picUrlss: req.public.picUrls,
-				currentTab: 0,
-				form: {
-					page: 1,
-					limit: 10,
-					couponState: 1
-				},
-				pageList: [],
-				isLoad: true,
-				ishow: false
-			};
-		},
-
-		components: {},
-		props: {},
-		onShow: function() {
-			this.form.page = 1;
-			this.isLoad = true;
-			this.setData({
-				pageList: []
-			});
-			this.loadCoupon();
-		},
-
-		onReachBottom() {
-			this.form.page++;
-			this.loadCoupon();
-		},
-
-		methods: {
-			tab(e) {
-				let that = this;
-				const index = e.currentTarget.dataset.current;
-				if (that.currentTab === index) {
-					return false;
-				}
-				that.setData({
-					currentTab: index
-				});
-				console.log('currentTab==' + that.currentTab)
-				that.form.couponState = index == 0 ? 1 : index == 1 ? 2 : 3;
-				// console.log(index, that.form.couponState);
-				that.form.page = 1;
-				that.isLoad = true;
-				that.setData({
-					pageList: []
-				});
-				that.loadCoupon();
-			},
-
-			loadCoupon() {
-				let isShowLoading = false;
-
-				if (this.form.page == 1 && !isShowLoading) {
-					req.loadIng('加载中');
-					isShowLoading = true;
-				}
-
-				if (!this.isLoad) return false;
-				this.isLoad = false;
-				let that = this;
-				req.getRequest('/api/coupon/user', this.form, data => {
-					if (data && data.length == 10) this.isLoad = true;
-					if (that.form.page > 1) data = that.pageList.concat(data);
-					data.map(it=>{
-						it.isShow = false;
-						return it;
-					})
-					that.setData({
-						pageList: data
-					});
-
-					if (!this.pageList || data.length <= 0) {
-						that.setData({
-							ishow: true
-						});
-					} else {
-						that.setData({
-							ishow: false
-						});
-					}
-
-					if (isShowLoading) {
-						uni.hideLoading();
-						isShowLoading = false;
-					}
-				});
-			},
-
-			toIndex() {
-
-				// header.appId=='ZQ1VK5oc17I387E'?'/pages/timelyDelivery/index':'/pages/index/index'
-				if (req.header.appId == 'ZQ1VK5oc17I387E') {
-					app.globalData.switchTab('pages/timelyDelivery/index')
-				} else {
-					app.globalData.switchTab('pages/index/index')
-				}
-			},
-			checks(item,index){
-				let pageList = this.pageList;
-				if(pageList[index].isShow){
-					pageList[index].isShow = false;
-				}else{
-					pageList.map(it=>{
-						it.isShow = false;
-						return it;
-					});
-					pageList[index].isShow = true;
-				}
-			},
-			toDetail(it){
-				uni.navigateTo({
-					url: '/product/detail/detail?id=' + it.id + '&merchantId=' + req.getStorage('MERCHANT').id
-				})
-			}
-
-		}
-	};
-</script>
-<style>
-	@import "./coupons.css";
-</style>

mine/couponsDet/couponsDet.css

@@ -1,38 +0,0 @@
-/* mine/couponsDet/couponsDet.wxss */
-.top{height: 260rpx;background-image: linear-gradient(to left,#FF0808,#F1674C);color: #ffffff; text-align: center;padding: 50rpx 0 0 0;}
-.fn48{font-size: 48rpx;}
-.fn24{font-size: 24rpx;}
-.fn30{font-size: 30rpx;}
-.mag10{margin-top: 20rpx;}
-.mag30{margin-top: 30rpx;}
-.fnc99{color: #999999;}
-.fnwit{font-weight: bold;}
-.con{  
-height: 940rpx;
- }
- .content{
-  width: 722rpx;
-  height: 85%;
-  position: absolute;
-  top: 18%;
-  left: 50%;
-  transform: translateX(-50%);
- }
-.background {
-  width: 100%;
-  height: 100%;
-  position:absolute; 
-  background-size:100% 100%;
-  /* z-index: -1; */
-}
-.lits{position: relative;z-index: 2;padding: 40rpx 0 32rpx 0; border-bottom: 1rpx dashed #999999; margin: 0 auto;width: 652rpx;}
-.left{font-weight: bold;font-size: 24rpx;color: #FF0808;font-weight: bold;margin-right: 20rpx;}
-.left text{font-size: 36rpx;font-weight: normal;}
-.left text.jine{font-size: 88rpx;font-weight: bold;}
-.tong{margin-top: 25rpx;}
-.tong view{font-size: 28rpx;color: #333333;margin-bottom: 5rpx;}
-.tong text{font-size: 24rpx;color: #333333;}
-.tiaoxingma{position: relative;text-align: center;}
-.tiaoxima{width: 620rpx;height: 160rpx; margin: 50rpx auto 10rpx auto;}
-.xcx{width: 300rpx; height: 300rpx;margin: 82rpx auto 25rpx auto;}
-.footer{padding: 0 0 0 20rpx;height: 200rpx;}

mine/couponsDet/couponsDet.vue

@@ -1,81 +0,0 @@
-<template>
-<view>
-<view class="top">
-	<view class="fn48">未使用</view>
-	<view class="fn24 mag10">使用日期：2020.05.19-2020.05.31</view>
-</view>
-<view class="con">
-	<view class="content">
-		<image src="/static/pages/images/yhq_det.png" class="background"></image>
-		<view class="lits dflex">
-			<view class="left"><text>￥</text><text class="jine">40{{item.couponAmount}}</text>元</view>
-			<view class="tong flex">
-				<view class="fnwit">{{item.couponType === 1 ? '满减券' : '代金券'}}</view>
-				<text>{{item.couponBrief}}订单满200元可用</text>
-			</view>
-		</view>
-		<!-- <view class="tiaoxingma">
-			<image src="/static/pages/images/tiaoxma.png" class="tiaoxima"></image>
-			<view>058695649895115</view>
-			<image src="/static/pages/images/xcx.png" class="xcx"></image>
-			<view>请向工作人员出示</view>
-		</view> -->
-	</view>
-</view>
-<view class="footer">
-	<view class="fnwit fn30">使用说明</view>
-	<view class="mag30 fn28 fnc99">适用范围:</view>
-</view>
-</view>
-</template>
-
-<script>
-
-export default {
-  data() {
-    return {};
-  },
-
-  components: {},
-  props: {},
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {},
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {},
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {},
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {},
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {},
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {},
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {},
-  methods: {}
-};
-</script>
-<style>
-@import "./couponsDet.css";
-</style>

mine/deliverExtend/deliverExtend.css

@@ -1,18 +0,0 @@
-/* mine/deliverExtend/deliverExtend.wxss */
-.top{text-align: center;padding: 30rpx 0;color: #9D9E9E;}
-.content{padding: 30rpx 30rpx 0rpx 30rpx;margin: 0 0 20rpx 0; }
-.wuliu{justify-content: space-between;font-size: 28rpx;}
-.imag{align-items: center;}
-.wuliu .imag .dingdan{width: 33rpx;height: 33rpx; margin-right: 19rpx;}
-.psfs{background: #fff;margin:20rpx 0rpx 20rpx 20rpx;overflow: hidden;position: relative;}
-.psico{width: 41rpx;height: 31rpx;margin-right: 22rpx;margin-top: 5rpx;}
-.psfs .flex view{font-size: 28rpx;color: #0065AC;margin-bottom: 12rpx;line-height: 40rpx;}
-.psfs .flex text{display: block;font-size: 24rpx;color: #666;}
-.rico1{width: 14rpx;height: 26rpx;position: absolute;top: 50%;right: 20rpx;transform: translateY(-50%);}
-.kuaidi,.product{border-bottom: 1rpx solid #EFEFEF;}
-.guige{font-size: 24rpx; color: #9D9E9E;padding: 10rpx 0 20rpx 0;}
-.product{padding: 30rpx 0 20rpx 0; font-size: 32rpx;}
-.money{justify-content: space-between;}
-.money .pic{font-size: 24rpx ; color: #F32727;}
-.money .pic text{font-size: 32rpx;}
-.all{padding: 30rpx 0; text-align: center; color: #9D9E9E;}

mine/deliverExtend/deliverExtend.vue

@@ -1,124 +0,0 @@
-<template>
-<view>
-<!--mine/deliverExtend/deliverExtend.wxml-->
-<view class="top">该订单已被拆分为{{list.length}}个包裹发货</view>
-<view v-for="(item, index) in list" :key="index" class="bgfff content">
-  <view class="dflex wuliu">
-    <view class="dflex imag"><image src="/mine/static/mine/images/list.png" class="dingdan"></image>分单{{index+1}} </view>
-    <view>{{item.express?item.express:''}} {{item.expressNo?item.expressNo:''}}</view>
-  </view>
-  <view class="kuaidi">
-    <view class="psfs dflex" @tap="goUrl" :data-url="'/mine/logistics/logistics?id=' + item.id + '&orderId=' + id">
-      <image src="/static/pages/images/psico.png" class="psico"></image>
-      <view class="flex">
-        <view>{{item.logistics.context}}</view>
-        <text>{{item.logistics.time?item.logistics.time:time}}</text>
-      </view>
-      <image src="/static/pages/images/more.png" class="rico1"></image>
-    </view>
-  </view>
-  <view v-for="(items, index2) in item.extendDTOList" :key="index2" class="product">
-    <view>{{items.productName}}</view>
-    <!-- <view class="guige">规格：额阿伟啊</view> -->
-    <view class="money dflex">
-      <view class="pic">￥<text>{{items.money}}</text></view>
-      <view>x{{items.quantity}}</view>
-    </view>
-  </view>
-  <view class="all">查看全部</view>
-</view>
-</view>
-</template>
-
-<script>
-// mine/deliverExtend/deliverExtend.js
-const app = getApp(); // const QRCode = require('../../utils/weapp.qrcode.js')
-// const QRCode = require('../../utils/weapp.qrcode.js')
-const req = require("../../utils/request.js");
-
-export default {
-  data() {
-    return {
-      id: "",
-      time: "",
-      list: ""
-    };
-  },
-
-  components: {},
-  props: {},
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    this.query = options;
-    this.setData({
-      id: options.orderId
-    });
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-    this.deliverExtend();
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {},
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {},
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {},
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {},
-  methods: {
-    // 获取分单发货的
-    deliverExtend() {
-      let time = new Date().toLocaleString();
-      this.setData({
-        time: time
-      });
-      req.postRequest('/api/order/deliverExtend', {
-        id: this.query.orderId
-      }, res => {
-        // console.log(res);
-
-        if (!res) {} else {
-          res = res.map(it => {
-            it.logistics = JSON.parse(it.logistics);
-            return it;
-          });
-          // console.log(res);
-          this.setData({
-            list: res
-          });
-        }
-      });
-    },
-
-    goUrl(e) {
-      var dataset = e.currentTarget.dataset;
-      uni.navigateTo({
-        url: dataset.url
-      });
-    }
-
-  }
-};
-</script>
-<style>
-@import "./deliverExtend.css";
-</style>

mine/footprint/footprint.css

@@ -1,13 +0,0 @@
-/* mine/footprint/footprint.wxss */
-.date{padding: 20rpx;font-size: 30rpx;color: #333;}
-.list{background: #fff;padding: 0 20rpx;}
-.list .li{display: flex;display: -webkit-flex;align-items: center;padding: 30rpx 10rpx;border-bottom: 2rpx solid #f5f5f5;}
-.list .li:last-child{border-bottom: none;}
-.cimg{width: 180rpx;height: 180rpx;border-radius: 10rpx;margin-right: 30rpx;border: 2rpx solid #E5E5E5;box-sizing: border-box;}
-.zhinfo{flex:1;-webkit-flex: 1;overflow: hidden;position: relative;}
-.zhtit{font-size: 30rpx;color: #333;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;}
-.guige{font-size: 22rpx;color: #999;margin-top: 5rpx;}
-.jiage{display: flex;display: -webkit-flex;align-items: center;justify-content: space-between;margin-top: 55rpx;}
-.zhjia{font-size:28rpx;color: #FE0419;}
-.zhjia text{font-size: 36rpx;}
-.btn{font-size: 22rpx;color: #333;width: 136rpx;height: 46rpx;border-radius: 25rpx;border: 2rpx solid #D2D2D2;text-align: center;line-height: 46rpx;}

mine/footprint/footprint.vue

@@ -1,122 +0,0 @@
-<template>
-	<view>
-		<!--mine/footprint/footprint.wxml-->
-		<view v-if="pageList.length > 0">
-			<block v-for="(item, index) in pageList" :key="index">
-				<view class="date">{{item.times}}</view>
-				<view class="list">
-					<navigator v-for="(item, index2) in item.nodes" :key="index2"
-						:url="'/product/detail/detail?id=' + item.id" hover-class="none" class="li">
-						<image :src="item.pic" mode="aspectFit" class="cimg"></image>
-						<view class="zhinfo">
-							<view class="zhtit">{{item.title}}</view>
-							<!-- <view class="guige">规格：15g</view> -->
-							<view class="jiage">
-								<view class="zhjia">￥<text>{{item.salePrice}}</text></view>
-							</view>
-						</view>
-					</navigator>
-				</view>
-			</block>
-		</view>
-		<view class="nodata" v-if="ishow">
-			<image :src="picUrlss+'empty.png'"></image>
-			<text>暂无记录~</text>
-		</view>
-	</view>
-</template>
-
-<script>
-	const req = require("../../utils/request.js");
-	const app = getApp();
-
-	export default {
-		data() {
-			return {
-				picUrlss: req.public.picUrls,
-				form: {
-					page: 1,
-					limit: 10
-				},
-				pageList: [],
-				isLoad: true,
-				ishow: false
-			};
-		},
-
-		components: {},
-		props: {},
-		onLoad: function(options) {
-			this.loadFootprint();
-		},
-
-		onReachBottom() {
-			this.form.page++;
-			this.loadFootprint();
-		},
-
-		methods: {
-			loadFootprint() {
-				let isShowLoading = false;
-
-				if (this.form.page == 1 && !isShowLoading) {
-					req.loadIng('加载中');
-					isShowLoading = true;
-				}
-
-				if (!this.isLoad) return false;
-				this.isLoad = false;
-				let that = this;
-				req.getRequest('/api/footprint/product', this.form, data => {
-					if (data && data.length == 10) this.isLoad = true;
-					let pageList = that.pageList;
-
-					if (data && data.length > 0) {
-						data = data.map(it => {
-							const t = it.createDate.split('-');
-							it.times = t[1] + '-' + t[2];
-							return it;
-						});
-						data.forEach(it => {
-							let isExist = pageList.filter(pg => pg.createDate === it.createDate).length >
-							0;
-							let nodes = [];
-
-							if (isExist) {
-								pageList[pageList.length - 1].nodes.push(it);
-							} else {
-								let map = {
-									times: it.times,
-									createDate: it.createDate
-								};
-								nodes.push(it);
-								map.nodes = nodes;
-								pageList.push(map);
-							}
-						});
-						that.setData({
-							pageList: pageList
-						});
-						that.setData({
-							ishow: false
-						});
-						// console.log(pageList);
-					} else {
-						that.setData({
-							ishow: true
-						});
-					}
-
-					if (isShowLoading) {
-						uni.hideLoading();
-						isShowLoading = false;
-					}
-				});
-			}
-
-		}
-	};
-</script>
-<style>
-	@import "./footprint.css";
-</style>

mine/invoice/invoice.css

@@ -1,25 +0,0 @@
-/* invoice.css */
-page{background: #f8f8f8;}
-.search-box{background: var(--mina);padding: 16rpx 32rpx;}
-.search{background: #fff;height: 80rpx;border-radius: 10rpx;padding: 0 26rpx;}
-.ssico{width: 29rpx;height: 32rpx;margin-right: 14rpx;}
-.ipt{font-size: 28rpx;color: #333;padding: 20rpx 0;}
-.placeholder{color: #666;}
-.filter{margin: 0 32rpx;}
-.filter .li{font-size: 28rpx;color: #999;margin-right: 45rpx;}
-.picker view{display: inline-block;padding:30rpx 0;vertical-align: middle;}
-.bico{display: inline-block;width: 19rpx;height: 13rpx;margin-left: 12rpx;vertical-align: middle;}
-.list{margin: 0 32rpx;padding-bottom: 30rpx;}
-.list .li{margin-bottom: 20rpx;position: relative;overflow: hidden;font-size: 28rpx;color: #333;line-height: 38rpx;}
-.left,.right{width: 16rpx;height: 240rpx;position: absolute;top: 0;}
-.left{left: 0;}
-.right{right: 0;}
-.licon{margin: 0 16rpx;background: #fff;padding: 35rpx 20rpx 24rpx;}
-.licon .lis{align-items: flex-start;margin-bottom: 11rpx;}
-.licon label{display: block;color: #999;width: 142rpx;}
-.sta{width: 190rpx;text-align: right;justify-content: flex-end;}
-.fpico{width: 34rpx;height: 34rpx;margin-right: 7rpx;}
-.no-invoice{text-align: center;font-size: 28rpx;color: #333;padding: 140rpx 0 0;}
-.no-invoice image{width: 360rpx;height: 230rpx;margin: 0 auto;}
-.tip{margin: 35rpx 0 80rpx;}
-.btn{width: 276rpx;height: 80rpx;background: #108FFF;border-radius: 40rpx;font-size: 32rpx;color: #fff;text-align: center;line-height: 80rpx;margin: 0 auto;}

mine/invoice/invoice.vue

@@ -1,176 +0,0 @@
-<template>
-	<view>
-		<view class="search-box">
-			<view class="search ddflex">
-				<image src="../static/mine/images/ssico.png" class="ssico"></image>
-				<input placeholder="搜索发票抬头" placeholder-class="placeholder" v-model="title" @confirm="confirmTitle" class="ipt fflex" />
-			</view>
-		</view>
-		<view class="filter ddflex">
-			<view class="li">
-				<picker class="picker" :range="state" range-key="label" @change="changeState">
-					<view>{{stateName}}</view>
-					<image src="../static/mine/images/bico.png" class="bico"></image>
-				</picker>
-			</view>
-			<view class="li">
-				<picker class="picker" :range="dateType" range-key="label" @change="changeDateType">
-					<view>{{dateTypeName}}</view>
-					<image src="../static/mine/images/bico.png" class="bico"></image>
-				</picker>
-			</view>
-		</view>
-		<block v-if="isShow">
-		<view class="list" v-if="pageList && pageList.length > 0">
-			<navigator :url="'/invoice/detail/detail?id=' + item.id" hover-class="none" class="li" v-for="(item,index) in pageList" :key="index">
-				<image src="../static/mine/images/left.png" class="left"></image>
-				<image src="../static/mine/images/right.png" class="right"></image>
-				<view class="licon">
-					<view class="lis ddflex">
-						<label>发票抬头</label>
-						<view class="fflex tover">{{item.title}}</view>
-						<view class="sta ddflex" v-if="item.state == 1">待开票</view>
-						<view class="sta ddflex" v-else><image src="../static/mine/images/fpico.png" class="fpico"></image>已开票</view>
-					</view>
-					<view class="lis ddflex ddflex">
-						<label>开票金额</label>
-						<view class="fflex">￥{{item.money}}</view>
-					</view>
-					<view class="lis ddflex">
-						<label>开票内容</label>
-						<view class="fflex tovers">{{item.content}}</view>
-					</view>
-				</view>
-			</navigator>
-		</view>
-		<view class="no-invoice" v-else>
-			<image src="../static/mine/images/empty.png"></image>
-			<view class="tip">暂无开票记录~</view>
-			<navigator url="/mine/order/order" hover-class="none" class="btn">去开票</navigator>
-		</view>
-		</block>
-	</view>
-</template>
-
-<script>
-	const req = require('../../utils/request.js');
-	export default {
-		data() {
-			return{
-				form: {
-					page: 1,
-					limit: 10
-				},
-				pageList: [],
-				isLoad: true,
-				title: '',
-				state: [
-					{
-						label: '待开票',
-						value: 1
-					},
-					{
-						label: '已开票',
-						value: 2
-					}
-				],
-				stateIndex: -1,
-				stateName: '状态',
-				dateType: [
-					{
-						label: '一周内',
-						value: 1
-					},
-					{
-						label: '一月内',
-						value: 2
-					},
-					{
-						label: '一季度内',
-						value: 3
-					},
-					{
-						label: '一年内',
-						value: 4
-					}
-				],
-				dateTypeIndex: -1,
-				dateTypeName: '发票日期',
-				isShow: false
-			}
-		},
-		onLoad() {
-			uni.setNavigationBarColor({
-				frontColor: '#ffffff',
-				backgroundColor: req.public.titleTopBgColor
-			});
-			this.getPageList();
-		},
-		onReachBottom() {
-			this.form.page++;
-			this.getPageList();
-		},
-		methods:{
-			confirmTitle(e){
-				this.title = e.detail.value;
-				this.form.page = 1;
-				this.isLoad = true;
-				this.getPageList()
-			},
-			changeState(e){
-				this.stateIndex = e.detail.value;
-				this.stateName = this.state[this.stateIndex].label;
-				this.form.page = 1;
-				this.isLoad = true;
-				this.getPageList()
-			},
-			changeDateType(e){
-				this.dateTypeIndex = e.detail.value;
-				this.dateTypeName = this.dateType[this.dateTypeIndex].label;
-				this.form.page = 1;
-				this.isLoad = true;
-				this.getPageList()
-			},
-			getPageList(){
-				let isShowLoading = false;
-				if (this.form.page == 1 && !isShowLoading) {
-					req.loadIng('加载中');
-					isShowLoading = true;
-				}
-				if (!this.isLoad) return false;
-				this.isLoad = false;
-				let that = this;
-				let form = that.form;
-				if(that.title){
-					form.title = that.title;
-				}else{
-					delete form.state;
-				}
-				if(this.stateIndex > -1){
-					form.state = this.state[this.stateIndex].value;
-				}else{
-					delete form.state;
-				}
-				if(this.dateTypeIndex > -1){
-					form.dateType = this.dateType[this.dateTypeIndex].value;
-				}else{
-					delete form.dateType;
-				}
-				req.getRequest('/api/invoice/list', form, data => {
-					if (data.list && data.list.length == 10) this.isLoad = true;
-					if (that.form.page > 1) data.list = that.pageList.concat(data.list);
-					that.pageList = data.list
-					if (isShowLoading) {
-						uni.hideLoading();
-						isShowLoading = false;
-					}
-					that.isShow = true;
-				});
-			}
-		}
-	}
-</script>
-
-<style>
-	@import "./invoice.css";
-</style>

mine/logistics/logistics.css

@@ -1,21 +0,0 @@
-/* pages/logistics/logistics.wxss */
-page{background: #fff;padding-bottom: 140rpx;}
-.status{padding: 30rpx 35rpx 35rpx;border-bottom: 20rpx solid #f6f6f6;}
-.status view{font-size: 30rpx;color: #333;line-height: 40rpx;}
-.status text{display: block;font-size: 28rpx;color: #999;line-height: 40rpx;}
-.status view text{font-size: 30rpx;color: #FE0419;display: inline-block;}
-.wuliu{padding: 0 35rpx;}
-.tit{font-size: 30rpx;color: #333;padding: 25rpx 0;border-bottom: 1rpx solid #EEEEEE;}
-.pslist{padding: 40rpx 0 0 20rpx;}
-.pslist .li{padding-bottom: 65rpx;display: flex;display: -webkit-flex;align-items: center;padding-left: 45rpx;position: relative;}
-.pslist .li::before{content: '';display: block;width: 20rpx;height: 20rpx;border-radius: 50%;background: #ddd;position: absolute;top: 12rpx;left: -10rpx;z-index: 2;}
-.pslist .li::after{content: '';display: block;width: 2rpx;background: #ddd;position: absolute;top: 10rpx;left: 0;bottom: -12rpx;z-index: 1;}
-.pslist .li:last-child::after{display: none;}
-.lis{flex: 1;-webkit-flex: 1;margin-right: 20rpx;}
-.lis view{font-size: 28rpx;color: #333;}
-.lis text{display: block;font-size: 24rpx;color: #999;margin: 10rpx 0 0;}
-.pslist .li.ing view{color: #FE0419;}
-.pslist .li.ing::before{border: 8rpx solid #ffd3d7;background: #FE0419;left: -17rpx;top: 6rpx;}
-.rico1{display: block;width: 18.2rpx;height: 27.3rpx;position: absolute; top: 70rpx;right: 30rpx;  }
-
-.confirm{position: fixed;left: 30rpx;bottom: 40rpx;right: 30rpx;height: 80rpx;line-height: 80rpx;text-align: center;font-size: 30rpx;color: #fff;border-radius: 40rpx;background: #FE0419;z-index: 5;}

mine/logistics/logistics.vue

@@ -1,126 +0,0 @@
-<template>
-	<view>
-		<!-- <view class="status"  bindtap="goUrl"  data-url="/pages/my/seperate/seperate?id={{orderId}}&fdid={{id}}"  > -->
-		<view class="status">
-			<text v-if="orderId">订单编号：{{orderId}}</text>
-			<text v-if="detail.expressNo">{{detail.express}}：{{detail.expressNo}}</text>
-			<text v-if="detail.mobile">客服电话：{{detail.mobile}}</text>
-			<image src="/static/pages/images/rico.png" class="rico1"></image>
-		</view>
-		<view class="wuliu">
-			<view class="tit">物流跟踪</view>
-			<view class="pslist" v-if="detail.messages">
-				<block v-for="(item, index) in detail.messages" :key="index">
-					<view :class="'li ' + (index==0?'ing':'')">
-						<view class="lis">
-							<view>{{item.context}}</view>
-							<text>{{item.ftime}}</text>
-						</view>
-					</view>
-				</block>
-			</view>
-			<view class="nodata" v-else>
-				<image :src="picUrlss+'empty.png'"></image>
-				<text>暂无</text>
-			</view>
-		</view>
-		<view class="confirm" @click="confirmOrder" v-if="!isReceived&&type!=1">确认收货</view>
-	</view>
-</template>
-
-<script>
-	const app = getApp();
-	const req = require("../../utils/request.js");
-
-	export default {
-		data() {
-			return {
-				picUrlss: req.public.picUrls,
-				detail: {},
-				//物流详情 
-				id: 0,
-				orderId: '',
-				fdidx: '',
-				type: 0,
-				isReceived: false
-			};
-		},
-
-		components: {},
-		props: {},
-		onLoad: function(options) {
-			this.setData({
-				id: options.id,
-				orderId: options.orderId ? options.orderId : '',
-				type: options.type ? options.type : 0,
-				isReceived: options.isReceived ? true : false
-			});
-
-			if (options.fdidx) {
-				this.fdidx = options.fdidx;
-				uni.setNavigationBarTitle({
-					title: "分单" + this.chinanum(options.fdidx) + "物流"
-				});
-			}
-
-			this.getDetail();
-		},
-		methods: {
-			chinanum(num) {
-				var china = ['零', '一', '二', '三', '四', '五', '六', '七', '八', '九'];
-				var arr = [];
-				num = num.toString();
-				var english = num.split('');
-
-				for (var i = 0; i < english.length; i++) {
-					arr.push(china[english[i] * 1]);
-				}
-
-				return arr.join("");
-			},
-
-			goUrl(e) {
-				var dataset = e.currentTarget.dataset;
-				// console.log(dataset.url);
-				uni.navigateTo({
-					url: dataset.url
-				});
-			},
-
-			getDetail() {
-				var _this = this;
-
-				req.getRequest('/api/deliver/detail', {
-					id: this.id,
-					type: this.type
-				}, res => {
-					_this.setData({
-						detail: res
-					});
-				});
-			},
-			confirmOrder() {
-				//确认收货
-				// let index = event.currentTarget.dataset.index;
-				// let page = this.data.pageList[index];
-				let that = this;
-				req.msgConfirm('确认执行该操作？', () => {
-					req.postRequest(
-						'/api/order/newReceiving',
-						{
-							id: that.id
-						},
-						() => {
-							uni.navigateBack();
-						}
-					);
-				});
-			},
-			
-
-		}
-	};
-</script>
-<style>
-	@import "./logistics.css";
-</style>

mine/remind/remind.css

@@ -1,16 +0,0 @@
-/* mine/remind/remind.wxss */
-.list{margin: 0 20rpx;padding-bottom: 20rpx;}
-.list .li{margin: 20rpx 0 0;background: #fff;border-radius: 10rpx;}
-.list .lis{display: flex;display: -webkit-flex;align-items: center;padding: 30rpx 20rpx;border-bottom: 2rpx solid #f5f5f5;}
-.cimg{width: 180rpx;height: 180rpx;border-radius: 10rpx;margin-right: 30rpx;border: 2rpx solid #E5E5E5;box-sizing: border-box;}
-.zhinfo{flex:1;-webkit-flex: 1;overflow: hidden;position: relative;}
-.zhtit{font-size: 30rpx;color: #333;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;}
-.guige{font-size: 22rpx;color: #999;margin-top: 5rpx;}
-.jiage{display: flex;display: -webkit-flex;align-items: center;justify-content: space-between;margin-top: 55rpx;}
-.zhjia{font-size:28rpx;color: #FE0419;}
-.zhjia text{font-size: 36rpx;}
-.operate{align-items: center;justify-content: space-between;padding: 25rpx 20rpx;}
-.time{align-items: center;font-size: 28rpx;color: #FE0419;}
-.time view{font-size: 22rpx;margin-right: 15rpx;color: #333;}
-.time text{display: block;width: 36rpx;height: 36rpx;text-align: center;line-height: 36rpx;border-radius: 6rpx;font-size: 24rpx;color: #FE0419;margin: 0 5rpx;}
-.btn{font-size: 22rpx;color: #333;width: 136rpx;height: 46rpx;border-radius: 25rpx;border: 2rpx solid #D2D2D2;text-align: center;line-height: 46rpx;}

mine/remind/remind.vue

@@ -1,173 +0,0 @@
-<template>
-<view>
-<!--mine/remind/remind.wxml-->
-<view class="list" v-if="pageList.length > 0">
-	<view v-for="(item, index) in pageList" :key="index" class="li">
-		<navigator :url="'/product/groupDetail/groupDetail?acid=' + item.id + '&id=' + item.productId" hover-class="none" class="lis">
-			<image :src="item.pic" mode="aspectFit" class="cimg"></image>
-			<view class="zhinfo">
-				<view class="zhtit">{{item.productName}}</view>
-				<!-- <view class="guige">规格：15g</view> -->
-				<view class="jiage">
-					<view class="zhjia">￥<text>{{item.money}}</text></view>
-				</view>
-			</view>
-		</navigator>
-		<view class="operate dflex">
-			<view class="time dflex">
-				<view>距{{item.start ? '结束' : '开始'}}还有</view>
-				<block v-if="item.times[0] !==0"><text>{{item.times[0]}}</text>天</block>
-				<text>{{item.times[1]}}</text>:
-				<text>{{item.times[2]}}</text>:
-				<text>{{item.times[3]}}</text>
-			</view>
-			<view class="btn" :data-index="index" @tap="cancelRemind">取消预约</view>
-		</view>
-	</view>
-</view>
-
-<view class="nodata" v-if="ishow">
-  <image :src="picUrlss+'empty_kt.png'"></image>
-  <text>没有开团提醒哦</text>
-</view>
-</view>
-</template>
-
-<script>
-const req = require("../../utils/request.js");
-const utils = require("../../utils/util.js");
-
-export default {
-  data() {
-    return {
-		picUrlss: req.public.picUrls,
-      form: {
-        page: 1,
-        limit: 10
-      },
-      pageList: [],
-      isLoad: true,
-      ishow: false
-    };
-  },
-
-  components: {},
-  props: {},
-  onLoad: function (options) {
-    this.loadFootprint();
-  },
-
-  onReachBottom() {
-    this.form.page++;
-    this.loadFootprint();
-  },
-
-  onUnload() {
-    this.clearAllTimer();
-  },
-
-  methods: {
-    loadFootprint() {
-      let isShowLoading = false;
-
-      if (this.form.page == 1 && !isShowLoading) {
-        req.loadIng('加载中');
-        isShowLoading = true;
-      }
-
-      if (!this.isLoad) return false;
-      this.isLoad = false;
-      let that = this;
-      req.getRequest('/api/activity/remind/list', this.form, data => {
-        if (data && data.length == 10) this.isLoad = true;
-        if (that.form.page > 1) data = that.pageList.concat(data);
-        that.setData({
-          pageList: data
-        });
-
-        if (data.length <= 0) {
-          that.setData({
-            ishow: true
-          });
-        } else {
-          that.setData({
-            ishow: false
-          });
-        }
-
-        if (isShowLoading) {
-          uni.hideLoading();
-          isShowLoading = false;
-        }
-
-        that.initGroupTimer();
-      });
-    },
-
-    initGroupTimer() {
-      //社区拼图定时器
-      let _ts = this;
-
-      if (this.pageList && this.pageList.length > 0) {
-        let pageList = this.pageList;
-        const initPage = (parseInt(this.form.page) - 1) * 10;
-
-        for (let i = initPage, len = pageList.length; i < len; i++) {
-          let group = pageList[i];
-          let nowTime = new Date(group.nowTime.replace(/-/g, '/')).getTime();
-          let startTime = new Date(group.startTime.replace(/-/g, '/')).getTime();
-          let endTime = new Date(group.endTime.replace(/-/g, '/')).getTime();
-          if (!group.start) endTime = startTime;
-          let times = parseInt((endTime - nowTime) / 1000);
-          let timer = setInterval(() => {
-            times--;
-            let data = {};
-
-            if (times === 0) {
-              //重新加载列表
-              data['pageList[' + i + '].end'] = true;
-              clearInterval(timer);
-            } else {
-              let n = utils.formatDayTimes(times);
-              data['pageList[' + i + '].times'] = n.split(/:|天/g);
-            }
-
-            _ts.setData(data);
-          }, 1000);
-          let fs = [];
-          fs['pageList[' + i + '].timer'] = timer;
-
-          _ts.setData(fs);
-        }
-      }
-    },
-
-    clearAllTimer() {
-      this.pageList.forEach(it => clearInterval(it.timer));
-    },
-
-    cancelRemind(event) {
-      const index = event.currentTarget.dataset.index;
-      const page = this.pageList[index];
-
-      let _ts = this;
-
-      req.postRequest('/api/activity/cancel/remind', {
-        id: page.id
-      }, data => {
-        clearInterval(page.timer);
-
-        _ts.pageList.splice(index, 1);
-
-        _ts.setData({
-          pageList: _ts.pageList
-        });
-      });
-    }
-
-  }
-};
-</script>
-<style>
-@import "./remind.css";
-</style>

mine/shop/shop.css

@@ -1,70 +0,0 @@
-/* mine/shop/shop.wxss */
-.top{background: var(--mina);padding: 30rpx 20rpx 0;height: 170rpx;}
-.topc{align-items: center;}
-.userimg{width: 80rpx;height: 80rpx;border-radius: 50%;margin-right: 20rpx;}
-.username{font-size: 30rpx;color: #fff;}
-.userinfo text{display: block;font-size: 24rpx;color: #fff;margin-top: 8rpx;}
-.share{width: 146rpx !important;height: 62rpx !important;background: #fff;border-radius: 32rpx !important;font-size: 24rpx;color: #EA6739;margin-left: 20rpx;align-items: center;justify-content: center;}
-.share image{width: 27rpx;height: 27rpx;margin-right: 12rpx;}
-.box1{border-radius: 50rpx 50rpx 0 0;padding: 26rpx 20rpx;margin-top: -52rpx;background: #fff;}
-.search{background: #F0F2F3;height: 70rpx;border-radius: 35rpx;padding: 0 15rpx 0 30rpx;align-items: center;font-size: 26rpx;color: #666;}
-.search image{width: 30rpx;height: 30rpx;margin-right: 13rpx;}
-.search image.sao{width: 42rpx;height: 42rpx;}
-.con{padding: 28rpx 20rpx;}
-.box{background: #fff;border-radius: 12rpx;overflow: hidden;}
-.mstit{margin: 32rpx 18rpx;align-items: center;}
-.msico{width: 21rpx;height: 34rpx;}
-.xsms{width: 161rpx;height: 32rpx;margin: 0 30rpx 0 10rpx;}
-.countdown{align-items: center;font-size: 24rpx;color: #333;}
-.countdown text{display: block;background: #333;border-radius: 3rpx;width: 32rpx;height: 28rpx;font-size: 24rpx;color: #fff;text-align: center;line-height: 28rpx;margin: 0 5rpx;}
-.times{margin-bottom: 30rpx;}
-.times .li{width: 20%;text-align: center;font-size: 20rpx;color: #999;position: relative;}
-.times .li::before{content: '';display: block;width: 2rpx;height: 61rpx;background: #D2D2D2;position: absolute;left: 0;bottom: 5rpx;}
-.times .li:first-child::before{display: none;}
-.times .li text{display: block;font-size: 33rpx;color: #333;margin-bottom: 5rpx;}
-.times .li.active,.times .li.active text{color: #FE0419;}
-.msinfos{padding: 20rpx 20rpx 32rpx}
-.msinfos image{width: 100%;height: 390rpx;}
-.msinfo{padding: 0 9rpx}
-.msname{font-size: 30rpx;line-height: 36rpx;margin: 20rpx 0 10rpx}
-.qgsta{align-items: center;justify-content: space-between;}
-.price{font-size: 24rpx;color: #FE0419;}
-.price text{font-size: 36rpx;font-weight: bold;}
-.price .del{font-weight: normal;font-size: 24rpx;color: #999;margin-left: 12rpx;text-decoration: line-through;}
-.qiang{width: 180rpx;height: 70rpx;border-radius: 35rpx;text-align: center;line-height: 70rpx;font-size: 30rpx;color: #fff;}
-.title{justify-content: space-between;align-items: center;font-size: 36rpx;font-weight: bold;padding-top: 30rpx;padding-bottom: 30rpx;}
-.title text{font-size: 24rpx;color: #666;margin-left: 10rpx;font-weight: normal;}
-.more{width: 16rpx;height: 27rpx;}
-.shequ .li{border-bottom: 2rpx solid #eee;padding: 0 20rpx 38rpx;margin-bottom: 38rpx;overflow: hidden;}
-.shequ .li:last-child{border-bottom: none;margin-bottom: 0;}
-.shequ .li .flex{overflow: hidden;}
-.proimg{box-sizing: border-box;width: 210rpx;height: 210rpx;border-radius: 10rpx;margin-right: 20rpx;border: 2rpx solid #E5E5E5;}
-.proname{font-size: 28rpx;color: #333;text-overflow: ellipsis;white-space: nowrap;overflow: hidden;}
-.endtime{display: inline-block;height: 32rpx;line-height: 32rpx;border: 2rpx solid #FE0419;border-radius: 6rpx;padding: 0 8rpx;font-size: 24rpx;color: #FE0419;margin: 15rpx 0 65rpx;}
-.operate{justify-content: space-between;align-items: center;}
-.price .del{font-weight: normal;font-size: 24rpx;color: #999;margin-left: 12rpx;text-decoration: line-through;}
-.add-cart image{width: 42rpx;height: 42rpx;}
-.nums{align-items: center;}
-.num{font-size: 30rpx;width: 50rpx;text-align: center;line-height: 42rpx;}
-.remind{width: 150rpx;height: 50rpx;border-radius: 25rpx;font-size: 24rpx;color: #fff;text-align: center;line-height: 50rpx;justify-content: center;}
-.datas{justify-content: space-between;align-items: center;font-size: 24rpx;color: #666;padding: 20rpx 0 0}
-.yigou{margin-left: 6rpx;align-items: center;}
-.yigou image{width: 40rpx;height: 40rpx;border-radius: 50%;margin-left: -6rpx;border: 2rpx solid #fff;}
-.yigou image.more1{border: none;width: 46rpx;height: 46rpx;}
-.yigou text{margin-left: 12rpx;}
-.xiaoliang{color: #999;}
-.pintuan{padding-bottom: 50rpx;}
-.pintuan .li{margin-bottom: 50rpx;}
-.pintuan .li:last-child{margin-bottom: 0;}
-.pinimgs{box-sizing: border-box;width: 210rpx;height: 210rpx;border-radius: 10rpx;margin-right: 20rpx;border: 2rpx solid #E5E5E5;position: relative;}
-.pinimg{display: block;width: 100%;height: 100%;}
-.tuan{display: block;width: 87rpx;height: 44rpx;font-size: 22rpx;color: #fff;text-align: center;line-height: 34rpx;position: absolute;top: 21rpx;left: -10rpx;}
-.tuan image{display: block;width: 100%;height: 100%;position: absolute;top: 0;left: 0;}
-.tuan text{position: relative;z-index: 2;display: block;}
-.pininfo{overflow: hidden;}
-.pininfo .endtime{margin-bottom: 45rpx;}
-.pininfo .del{font-size: 24rpx;color: #999;text-decoration: line-through;}
-.tuijian{font-size: 36rpx;color: #333;font-weight: bold;align-items: center;justify-content: center;margin: 35rpx 0 25rpx;}
-.tuijian image{width: 28rpx;height: 18rpx;}
-.tuijian text{margin: 0 10rpx;}
-.tjlist .msinfos{margin-bottom: 20rpx;}

mine/shop/shop.vue

@@ -1,782 +0,0 @@
-<template>
-	<view>
-		<!--mine/shop/shop.wxml-->
-		<view class="top">
-			<view class="topc dflex">
-				<image :src="merchant.logo" mode="aspectFill" class="userimg"></image>
-				<view class="userinfo flex">
-					<view class="username">{{merchant.title}}</view>
-					<view class="username">电话：{{merchant.phone?merchant.phone:''}}</view>
-				</view>
-				<button open-type="share" class="share dflex">
-					<image src="/static/pages/images/bshare.png"></image>分享
-				</button>
-			</view>
-		</view>
-		<view class="box1">
-			<view class="search dflex">
-				<view class="dflex flex" @tap="search">
-					<image src="/static/pages/images/ssico.png"></image>
-					<view class="flex">搜索你想要的商品</view>
-				</view>
-			</view>
-		</view>
-		<view class="con">
-			<!-- 秒杀 -->
-			<view class="box" v-if="seckill.length>0">
-				<view class="mstit dflex">
-					<image src="/static/pages/images/msico.png" class="msico"></image>
-					<image src="/static/pages/images/xsms.png" class="xsms"></image>
-					<view class="countdown dflex">
-						<text>{{timer[0]}}</text>:<text>{{timer[1]}}</text>:<text>{{timer[2]}}</text>
-					</view>
-				</view>
-				<view class="times dflex">
-					<view v-for="(item, index) in TabList" :key="index"
-						:class="'li ' + (item.active ? 'active' : '') + ' left'" :data-index="index" @tap="switchTab">
-						<text :class="item.active ? 'weight' : ''">{{item.label}}</text>
-						<view :class="'state ' + (item.active? 'bg' :'')">{{item.state}}</view>
-					</view>
-					<!-- <view class="li active"><text>08:00</text>已开抢</view>
-      <view class="li"><text>10:00</text>已开抢</view>
-      <view class="li"><text>12:00</text>抢购中</view>
-      <view class="li"><text>14:00</text>即将开抢</view>
-      <view class="li"><text>16:00</text>待开抢</view> -->
-				</view>
-				<navigator v-for="(item, index) in seckill" :key="index" url hover-class="none"
-					class="msinfos bgfff r10">
-					<image :src="item.pic" mode="aspectFill" @tap="toSeckillList" :data-id="item.id"
-						:data-productId="item.productId"></image>
-					<view class="msinfo">
-						<view class="msname" @tap="toSeckillList" :data-id="item.id" :data-productId="item.productId">
-							{{item.productName}}
-						</view>
-						<view class="qgsta dflex">
-							<view class="price proprice" @tap="toSeckillList" :data-id="item.id"
-								:data-productId="item.productId">￥<text>{{item.money}}</text><text
-									class="del">￥{{item.marketPrice}}</text></view>
-							<view class="qiang mbgcolor" v-if="item.start" @tap="toSeckillList" :data-id="item.id"
-								:data-productId="item.productId">立即抢购</view>
-							<!-- <view class="remind mbglinear" bindtap="cancelActivityRemind" data-index="{{index}}" data-id="{{item.id}}" wx:if="{{item.isRemind}}" data-type="1">取消预约</view> -->
-							<block v-else>
-								<view class="qiang mbggreen" @tap="cancelActivityRemind" :data-index="index"
-									:data-id="item.id" v-if="item.isRemind" data-type="3">取消提醒</view>
-								<view class="qiang mbggreen" @tap="addActivityRemind" :data-index="index"
-									:data-id="item.id" data-type="3" v-else>预约提醒</view>
-							</block>
-						</view>
-					</view>
-				</navigator>
-			</view>
-			<!-- 社区团购 -->
-			<view class="mt20 bgfff r10" v-if="group.length > 0">
-				<navigator hover-class="none" url="/product/groupList/groupList" class="title pdlr20 dflex">社区团购<image
-						src="/static/pages/images/more.png" class="more"></image>
-				</navigator>
-				<view class="shequ">
-					<view v-for="(item, index) in group" :key="index" class="li">
-						<view class="dflex">
-							<image :src="item.pic" mode="aspectFill" class="proimg" :data-index="index"
-								@tap="toGroupRemind">
-							</image>
-							<view class="flex">
-								<view class="proname" :data-index="index" @tap="toGroupRemind">{{item.title}}</view>
-								<view class="endtime" :data-index="index" @tap="toGroupRemind">
-									{{item.start ? '距结束' : '距开始'}}
-									{{item.times}}
-								</view>
-								<view class="operate dflex">
-									<view class="price proprice" :data-index="index" @tap="toGroupRemind">
-										￥<text>{{item.money}}</text><text class="del">￥{{item.marketPrice}}</text>
-									</view>
-									<view class="add-cart">
-										<image src="/static/pages/images/jia.png" :data-index="index"
-											@tap="toGroupRemind" v-if="item.start"></image>
-										<block v-else>
-											<view class="remind mbggreen" @tap="cancelActivityRemind"
-												:data-index="index" :data-id="item.id" v-if="item.isRemind"
-												data-type="1">取消提醒</view>
-											<view class="remind mbggreen" @tap="addActivityRemind" :data-index="index"
-												:data-id="item.id" data-type="1" v-else>开团提醒</view>
-										</block>
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="datas dflex" v-if="item.start" :data-index="index" @tap="toGroupRemind">
-							<view class="yigou dflex">
-								<image v-for="(item, index2) in item.dtoList" :key="index2" :src="item.avatar"
-									mode="aspectFill"></image>
-								<image src="/static/pages/images/more1.png" mode="aspectFill" class="more1"
-									v-if="item.dtoList && item.dtoList.length > 0"></image>
-								<text>已售{{item.payQuantity}}/剩余{{item.quantity - item.payQuantity}}</text>
-							</view>
-							<view class="xiaoliang">累计销量 {{item.sellStock}}</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<!-- 拼团 -->
-			<view class="mt20 bgfff pdlr20 r10" v-if="joingroup.length>0">
-				<view class="title dflex" @tap="goUrl" data-url="activity/group/index/index?type=4">拼团<image
-						src="/static/pages/images/more.png" class="more"></image>
-				</view>
-				<goodsList :pageList="joingroup" :merchant="web">
-				</goodsList>
-				<!-- 				<view class="pintuan">
-					<view v-for="(item, index) in joingroup" :key="index" class="li dflex">
-						<view class="pinimgs" @tap="goUrl"
-							:data-url="'activity/group/detail/detail?acid=' + item.id + '&id=' + item.productId">
-							<image :src="item.pic" mode="aspectFill" class="pinimg"></image>
-							<view class="tuan">
-								<image src="/static/pages/images/tagbg.png"></image>
-								<text>3人团</text>
-							</view>
-						</view>
-						<view class="pininfo flex">
-							<view class="proname" @tap="goUrl"
-								:data-url="'activity/group/detail/detail?acid=' + item.id + '&id=' + item.productId">
-								{{item.productName}}
-							</view>
-							<view :class="'endtime ' + (item.start? '' : 'wei')">{{item.start ? '距结束': '距开始'}}
-								{{item.times}}
-							</view>
-							<view class="del" @tap="goUrl"
-								:data-url="'activity/group/detail/detail?acid=' + item.id + '&id=' + item.productId">
-								￥{{item.marketPrice}}</view>
-							<view class="operate dflex">
-								<view class="price" @tap="goUrl"
-									:data-url="'activity/group/detail/detail?acid=' + item.id + '&id=' + item.productId">
-									拼团价￥<text>{{item.money}}</text></view>
-								<view class="add-cart">
-									<view class="remind mbglinear dflex" v-if="item.start" @tap="goUrl"
-										:data-url="'activity/group/detail/detail?acid=' + item.id + '&id=' + item.productId">
-										立即开团</view>
-									<block v-else>
-										<view class="remind mbggreen dflex" v-if="item.isRemind"
-											@tap="cancelActivityRemind" :data-index="index" data-type="2"
-											:data-id="item.id">取消预约</view>
-										<view class="remind mbggreen dflex" @tap="addActivityRemind" :data-index="index"
-											data-type="2" :data-id="item.id" v-else>
-											<icon class="iconfont icon-yugao"></icon>预约提醒
-										</view>
-									</block>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view> -->
-			</view>
-
-			<!-- 店长推荐 -->
-			<view class="tuijian dflex" v-if="activityGroup.products.length>0">
-				<image src="/static/pages/images/tjico.png"></image>
-				<text>店长推荐</text>
-				<image src="/static/pages/images/tjico.png"></image>
-			</view>
-			<!-- <view class="tjlist">
-				<navigator v-for="(item, index) in activityGroup" :key="index" url hover-class="none"
-					class="msinfos bgfff r10" @tap="toDetail" :data-id="item.id">
-					<image :src="item.pic" mode="aspectFill"></image>
-					<view class="msinfo">
-						<view class="msname">{{item.title}}</view>
-						<view class="qgsta dflex">
-							<view class="price proprice">￥<text>{{item.actualPrice}}</text><text
-									class="del">￥{{item.marketPrice}}</text>
-							</view>
-							<view class="qiang mbgcolor">立即抢购</view>
-						</view>
-					</view>
-				</navigator>
-			</view> -->
-			<goodsList :pageList="activityGroup" :merchant="web">
-			</goodsList>
-		</view>
-		<view class="nodata_cart"
-			v-if="activityGroup.products.length<1&&joingroup.products.length<1&&group.products.length<1&&seckill.products.length<1&&bargain.products.length<1">
-			<image :src="picUrlss+'empty_xd.png'"></image>
-			<view>小店橱窗，空空如也~</view>
-			<text>挑选宝贝 > 查看详情 > 添加到小店</text>
-			<navigator url="/pages/index/index" open-type="switchTab" hover-class="none">去逛逛</navigator>
-		</view>
-
-
-
-		<!-- <view class="placeholder-view" :style="'height:' + (bottomBlankHeight + 115) + 'rpx'"></view> -->
-		<!-- <foot channel="shop" :isUpdate="isUpdate"></foot> -->
-	</view>
-</template>
-
-<script>
-	// mine/shop/shop.js
-	const app = getApp();
-	const req = require("../../utils/request.js");
-	const api = require("../../utils/api.js");
-	const utils = require("../../utils/util.js");
-	const mes = require("../../utils/requestmessage.js");
-	// import foot from "../../components/nav-bar/index";
-	import goodsList from "../../components/goodsList/goodsList";
-
-	export default {
-		data() {
-			return {
-				picUrlss: req.public.picUrls,
-				bottomBlankHeight: app.globalData.isIPhoneX ? 68 : 0,
-				isUpdate: false,
-				// 是否更新消息
-				activityGroup: {},
-				//店长推荐
-				group: {},
-				//社区团购
-				seckill: [],
-				//秒杀
-				joingroup: {},
-				//拼团
-				bargain: [],
-				//砍价
-				TabList: [{
-					label: '今天',
-					active: true,
-					state: "抢购中",
-					dayType: 1,
-					time: ''
-				}, {
-					label: '明天',
-					state: "预热中",
-					active: false,
-					time: '',
-					dayType: 2
-				}, {
-					label: '后天',
-					state: "预热中",
-					dayType: 3,
-					time: ''
-				}, {
-					label: '',
-					state: "预热中",
-					dayType: 4,
-					active: false,
-					time: ''
-				}, {
-					label: '',
-					state: "预热中",
-					dayType: 5,
-					active: false,
-					time: ''
-				}],
-				timer: "",
-				userInfo: "",
-				merchant: {},
-				homeTemplate: {},
-				web: ''
-			};
-		},
-
-		components: {
-			// foot
-			goodsList
-		},
-		props: {},
-		onLoad: function(options) {
-			console.log(options);
-			this.query = options;
-
-			if (options.scene) {
-				this.scene = options.scene;
-			}
-
-			if (options.isShare) {
-				req.setStorage('pidCode', options.userId);
-			}
-			this.web = '&merchantId=' + options.merchantId + '&shopId=' + options.shopId
-			uni.setNavigationBarColor({
-				frontColor: '#ffffff',
-				backgroundColor: req.public.titleTopBgColor
-			});
-			this.init();
-			this.getTime();
-			this.getShop();
-			this.getHomeTemplateConfig()
-		},
-
-		onShow() {
-			let _ts = this;
-
-			_ts.setData({
-				isUpdate: !_ts.isUpdate
-			});
-		},
-
-		onShareAppMessage: function() {
-			return {
-				title: req.excludeSpecial(req.getStorage('userInfo').nickName) + '为你推荐' + this.merchant.title,
-				// imageUrl: this.data.seckill[0].pic
-				// path: '/product/detail/detail?id=' + this.query.id + '&isShare=' + true + '&userId=' + req.getStorage('userInfo').id
-				path: '/pages/shop/shop?userId=' + req.getStorage('userInfo').id + '&isShare=' + true + '&shopId=' +
-					this.query.shopId + '&merchantId=' + this.query.merchantId
-			};
-		},
-		methods: {
-			//获取小店配置
-			getHomeTemplateConfig() {
-				let _ts = this;
-				req.getRequest('/api/config', {}, data => {
-
-					if (data.shop_config) {
-						this.setData({
-							homeTemplate: JSON.parse(data.shop_config)
-						});
-					}
-
-					console.log(this.homeTemplate)
-				});
-
-			},
-			/**
-			 * 
-			 * 设置tab导航
-			 */
-			switchTab(event) {
-				let index = event.currentTarget.dataset.index;
-				let def = this.TabList.findIndex(it => it.active);
-				let d = {};
-				console.log(index, def);
-				d[`TabList[${def}].active`] = false;
-				d[`TabList[${index}].active`] = true;
-				console.log(d);
-				this.isLoad = true; // this.data.form.page = 1;
-
-				d['pageList'] = []; // this.data.form.dayType = this.data.TabList[index].dayType;
-
-				this.setData(d);
-				this.seckillFun();
-				this.clearAllTimer(); // this.getDate()
-			},
-
-			/**
-			 * 获取当前时间往后退四天
-			 */
-			laterDay(num) {
-				var t = new Date();
-				var iToDay = t.getDate();
-				var iToMon = t.getMonth();
-				var iToYear = t.getFullYear();
-				var arr = [];
-
-				for (var i = 1; i < num + 1; i++) {
-					var newDate = new Date(iToYear, iToMon, iToDay + i);
-					arr.push(newDate.getFullYear() + '-' + (newDate.getMonth() + 1).toString().padStart(2, '0') + "-" +
-						newDate.getDate().toString().padStart(2, '0'));
-				} // console.log(arr)
-
-
-				return arr;
-			},
-
-			/**
-			 * 给tab添加动态时间
-			 */
-			getTime() {
-				const data = this.TabList;
-				var t = new Date();
-				var iToDay = t.getDate().toString().padStart(2, '0');
-				var iToMon = (t.getMonth() + 1).toString().padStart(2, '0');
-				var iToYear = t.getFullYear();
-				const rq = (iToYear + '-' + iToMon + '-' + iToDay).toString();
-				const rq1 = this.laterDay(4)[0];
-				const rq2 = this.laterDay(4)[1];
-				const rq3 = this.laterDay(4)[2];
-				const rq4 = this.laterDay(4)[3]; // console.log("rq" + "---", rq1, rq2, rq3, rq4)
-
-				data[0].time = rq;
-				data[1].time = rq1;
-				data[2].time = rq2;
-				data[3].label = this.getda(rq3);
-				data[3].time = rq3;
-				data[4].label = this.getda(rq4);
-				data[4].time = rq4;
-				this.setData({
-					TabList: data
-				}); // console.log(this.data.TabList)
-			},
-
-			/**
-			 * 时间转换
-			 */
-			getda(str) {
-				var strArr = str.split('-');
-				var day = strArr[2];
-				var month = strArr[1];
-				var year = strArr[0];
-				let date = (month + '月' + day + '日').toString();
-				return date;
-			},
-
-			search() {
-				app.globalData.openPage('pages/search/search');
-			},
-
-			async init() {
-				await this.loadGroup();
-				await this.groupFun();
-				await this.seckillFun();
-				await this.joingroupFun();
-				await this.bargainFun();
-			},
-
-			// 获取店长推荐
-			loadGroup() {
-				let _ts = this; // type
-				// 类型:1 普通商品 2 社区团购订单 3 秒杀订单 4 拼团订单 5 及时达订单 6 新客特价 7 优惠砍价
-
-
-				req.getRequest('/api/shopProduct/list', {
-					page: 1,
-					limit: 3,
-					type: 1,
-					// userId: this.query.userId
-					shopId: this.query.shopId,
-					merchantId: this.query.merchantId
-				}, data => {
-					data = data.map(it => {
-						it.isRemind = it.remindId;
-						return it;
-					});
-					console.log(data[0]);
-					let arrObjFilter
-					arrObjFilter = {
-						// backgroundColor:this.homeTemplate.backgroundColor,
-						displayStyle: this.homeTemplate.displayStyle,
-						lineNumber: this.homeTemplate.lineNumber,
-						products: data
-					};
-					_ts.setData({
-						activityGroup: arrObjFilter
-					});
-					console.log(this.activityGroup)
-					// _ts.initGroupTimer();
-
-				});
-			},
-
-			// 获取社区团购产品
-			groupFun() {
-				let _ts = this; // type
-				// 类型:1 普通商品 2 社区团购订单 3 秒杀订单 4 拼团订单 5 及时达订单 6 新客特价 7 优惠砍价
-
-
-				req.getRequest('/api/shopProduct/list', {
-					page: 1,
-					limit: 3,
-					// userId: this.query.userId
-					type: 2,
-					merchantId: this.query.merchantId,
-					sid: this.query.shopId
-				}, data => {
-					data = data.list.map(it => {
-						it.isRemind = it.remindId;
-						return it;
-					});
-					console.log(data);
-					let arrObjFilter
-					arrObjFilter = {
-						// backgroundColor:this.homeTemplate.backgroundColor,
-						displayStyle: this.homeTemplate.displayStyle,
-						lineNumber: this.homeTemplate.lineNumber,
-						products: data.filter(ele => ele.end == false)
-					};
-					_ts.setData({
-						group: arrObjFilter
-					}); // console.log(this.data.activityGroup)
-
-
-					_ts.initGroupTimer(2);
-				});
-			},
-
-			// 获取秒杀产品
-			seckillFun() {
-				let _ts = this; // type
-				// 类型:1 普通商品 2 社区团购订单 3 秒杀订单 4 拼团订单 5 及时达订单 6 新客特价 7 优惠砍价
-
-
-				req.getRequest('/api/shopProduct/list', {
-					page: 1,
-					limit: 3,
-					type: 3,
-					// userId: this.query.userId
-					shopId: this.query.shopId,
-					merchantId: this.query.merchantId
-				}, data => {
-					data = data.list.map(it => {
-						it.isRemind = it.remindId;
-						return it;
-					});
-					console.log(data);
-					let arrObjFilter
-					arrObjFilter = {
-						// backgroundColor:this.homeTemplate.backgroundColor,
-						displayStyle: this.homeTemplate.displayStyle,
-						lineNumber: this.homeTemplate.lineNumber,
-						products: data.filter(ele => ele.end == false)
-					};
-					_ts.setData({
-						seckill: arrObjFilter
-					}); // console.log(this.data.activityGroup)
-
-
-					var now = new Date();
-					var next = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1);
-					this.NextTime(next, function(hour, minute, second) {
-						hour = _ts.lpad(hour, 2);
-						minute = _ts.lpad(minute, 2);
-						second = _ts.lpad(second, 2);
-						let res = [hour, minute, second];
-
-						_ts.setData({
-							timer: res
-						});
-					});
-
-					_ts.initGroupTimer(3);
-				});
-			},
-
-			// 获取拼团产品
-			joingroupFun() {
-				let _ts = this; // type
-				// 类型:1 普通商品 2 社区团购订单 3 秒杀订单 4 拼团订单 5 及时达订单 6 新客特价 7 优惠砍价
-
-
-				req.getRequest('/api/shopProduct/list', {
-					page: 1,
-					limit: 3,
-					type: 4,
-					// userId: this.query.userId
-					shopId: this.query.shopId,
-					merchantId: this.query.merchantId
-				}, data => {
-					data = data.list.map(it => {
-						it.isRemind = it.remindId;
-						return it;
-					});
-					let arrObjFilter
-					arrObjFilter = {
-						// backgroundColor:this.homeTemplate.backgroundColor,
-						displayStyle: this.homeTemplate.displayStyle,
-						lineNumber: this.homeTemplate.lineNumber,
-						products:data.filter(ele => ele.end == false)
-					};
-					_ts.setData({
-						joingroup: arrObjFilter
-					}); // console.log(this.data.activityGroup)
-
-
-					_ts.initGroupTimer(4);
-				});
-			},
-
-			// 获取砍价产品
-			bargainFun() {
-				let _ts = this; // type
-				// 类型:1 普通商品 2 社区团购订单 3 秒杀订单 4 拼团订单 5 及时达订单 6 新客特价 7 优惠砍价
-
-
-				req.getRequest('/api/shopProduct/list', {
-					page: 1,
-					limit: 3,
-					type: 7,
-					// userId: this.query.userId
-					shopId: this.query.shopId,
-					merchantId: this.query.merchantId
-				}, data => {
-					data = data.list.map(it => {
-						it.isRemind = it.remindId;
-						return it;
-					});
-					let arrObjFilter
-					arrObjFilter = {
-						// backgroundColor:this.homeTemplate.backgroundColor,
-						displayStyle: this.homeTemplate.displayStyle,
-						lineNumber: this.homeTemplate.lineNumber,
-						products:data.filter(ele => ele.end == false)
-					};
-					_ts.setData({
-						bargain: arrObjFilter
-					}); // console.log(this.data.activityGroup)
-
-
-					_ts.initGroupTimer(7);
-				});
-			},
-
-			// 获取新客产品
-			//2为社区团购，4为拼团,7为砍价
-			initGroupTimer(type) {
-				//社区拼图定时器
-				let _ts = this;
-
-				let list = [];
-				if (type == 2) list = this.group.products;
-				else if (type == 4) list = this.joingroup.products;
-				else if (type == 7) list = this.bargain.products; // console.log(this.data.joingroupList)
-
-				if (list && list.length > 0) {
-					// let activityGroup = this.data.activityGroup;
-					for (let i = 0, len = list.length; i < len; i++) {
-						let group = list[i];
-						let nowTime = new Date(group.nowTime.replace(/-/g, '/')).getTime();
-						let startTime = new Date(group.startTime.replace(/-/g, '/')).getTime();
-						let endTime = new Date(group.endTime.replace(/-/g, '/')).getTime();
-						if (!group.start) endTime = startTime;
-						let times = parseInt((endTime - nowTime) / 1000);
-						console.log(times);
-						let timer = setInterval(() => {
-							times--;
-							let data = {};
-
-							if (times === 0) {
-								//重新加载列表
-								if (type == 2) data['group[' + i + '].end'] = true;
-								else if (type == 4) data['joingroup[' + i + '].end'] = true;
-								else if (type == 7) data['bargain[' + i + '].end'] = true;
-								clearInterval(timer);
-							} else {
-								let n = utils.formatDayTimes(times);
-								if (type == 2) data['group[' + i + '].times'] = n;
-								else if (type == 4) data['joingroup[' + i + '].times'] = n;
-								else if (type == 7) data['bargain[' + i + '].times'] = n.split(/:|天/g);
-							}
-
-							_ts.setData(data);
-						}, 1000);
-						if (type == 2) this.group[i]['timer'] = timer;
-						else if (type == 4) this.joingroup[i]['timer'] = timer;
-						else if (type == 7) this.bargain[i]['timer'] = timer; // let fs = [];
-						// fs['activityGroup[' + i + '].timer'] = timer;
-						// _ts.setData(fs);
-					}
-				}
-			},
-
-			// 一天倒计时
-			NextTime(next, cb) {
-				var t;
-
-				(function ft() {
-					var dif = (next.getTime() - new Date().getTime()) / 1000;
-
-					if (dif > 0) {
-						t = setTimeout(ft, 1000);
-						if (cb) cb(Math.floor(dif % 86400 / 3600), Math.floor(dif % 3600 / 60), Math.floor(dif % 60));
-					} else {
-						clearTimeout(t);
-					}
-				})();
-
-				return function() {
-					clearTimeout(t);
-				};
-			},
-
-			lpad(num, n) {
-				var len = num.toString().length;
-
-				while (len < n) {
-					num = "0" + num;
-					len++;
-				}
-
-				return num;
-			},
-
-			toGroupRemind(event) {
-				const index = event.currentTarget.dataset.index;
-				const activity = this.activityGroup[index];
-				app.globalData.openPage('product/groupDetail/groupDetail?acid=' + activity.id + "&id=" + activity
-					.productId);
-				console.log('acid', activity.id);
-				console.log('productId', activity.productId);
-			},
-
-			addActivityRemind(event) {
-				const index = event.currentTarget.dataset.index;
-				const id = event.currentTarget.dataset.id;
-				const type = event.currentTarget.dataset.type;
-				mes.remind().then(res => res);
-				req.postRequest('/api/activity/remind', {
-					activityId: id
-				}, res => {
-					req.msg('订阅提醒成功');
-					let data = {};
-					if (type == 1) data['activityGroup[' + index + '].isRemind'] = true;
-					else if (type == 2) data['joingroup[' + index + '].isRemind'] = true;
-					else if (type == 3) data['seckill[' + index + '].isRemind'] = true;
-					else if (type == 4) data['bargain[' + index + '].isRemind'] = true;
-					this.setData(data);
-				});
-			},
-
-			cancelActivityRemind(event) {
-				const index = event.currentTarget.dataset.index;
-				const id = event.currentTarget.dataset.id;
-				const type = event.currentTarget.dataset.type;
-				req.postRequest('/api/activity/cancel/remind', {
-					id: id
-				}, res => {
-					req.msg('取消提醒成功');
-					let data = {};
-					if (type == 1) data['activityGroup[' + index + '].isRemind'] = false;
-					else if (type == 2) data['joingroup[' + index + '].isRemind'] = false;
-					else if (type == 3) data['seckill[' + index + '].isRemind'] = false;
-					else if (type == 4) data['bargain[' + index + '].isRemind'] = false;
-					this.setData(data);
-				});
-			},
-
-			clearAllTimer() {
-				this.activityGroup.forEach(it => clearInterval(it.timer));
-			},
-
-			// 获取小店详情
-			getShop() {
-				let that = this;
-				req.getRequest('/api/merchant/detail', {
-					id: this.query.shopId
-				}, data => {
-					console.log(data);
-					this.setData({
-						merchant: data
-					});
-					console.log(this.merchant);
-				});
-			},
-
-			toDetail(e) {
-				let id = e.currentTarget.dataset.id;
-				app.globalData.openPage("product/detail/detail?id=" + id + '&&hideShop=' + false + '&shopId=' + this.query
-					.shopId + '&merchantId=' + this.query.merchantId);
-			},
-
-			goUrl(event) {
-				//跳转链接
-				let url = event.currentTarget.dataset.url;
-
-				app.globalData.openPage(url + '&&hideShop=' + false + '&shopId=' + this.query.shopId + '&merchantId=' +
-					this.query.merchantId);
-			},
-
-			toSeckillList(event) {
-				const id = event.currentTarget.dataset.id;
-				const productId = event.currentTarget.dataset.productid;
-				console.log(event.currentTarget.dataset);
-				app.globalData.openPage('activity/seckillDetails/seckillDetails?acid=' + id + "&id=" + productId +
-					'&&hideShop=' + false + '&shopId=' + this.query.shopId + '&merchantId=' + this.query.merchantId);
-			}
-
-		}
-	};
-</script>
-<style>
-	@import "./shop.css";
-</style>

pages.json

@@ -67,64 +67,12 @@
 			}
 		},
 		{
-			"path": "pages/sort/sort",
-			"style": {
-				"navigationBarTitleText": "分类"
-			}
-		},
-		{
-			"path": "pages/fenlei/fenlei",
-			"style": {
-				"navigationBarTitleText": "分类"
-			}
-		},
-		{
-			"path": "pages/video/video",
-			"style": {
-				"navigationBarTitleText": "直播回放"
-			}
-		},
-		{
-			"path": "pages/live/live",
-			"style": {
-				"navigationBarTitleText": "直播"
-			}
-		},
-		{
-			"path": "pages/interactive/index",
-			"style": {
-				"navigationBarTitleText": "互动社区"
-			}
-		},
-		{
-			"path": "pages/cart/cart",
-			"style": {
-				"navigationBarTitleText": "购物车"
-			}
-		},
-		{
 			"path": "pages/nearby/nearby",
 			"style": {
 				"navigationBarTitleText": "附近门店"
 			}
 		},
 		{
-			"path": "pages/search/search",
-			"style": {
-				"navigationBarTitleText": "搜索"
-			}
-		},
-		{
-			"path": "pages/topic/topic",
-			"style": {}
-		},
-		{
-			"path": "pages/topiclist/topiclist",
-			"style": {
-				"navigationBarTitleText": "特色专题"
-			}
-		},
-		{
 			"path": "pages/authorize/authorize",
 			"style": {
 				"navigationBarTitleText": ""
@@ -162,23 +110,10 @@
 			}
 		},
 		{
-			"path": "pages/liveMiddle/liveMiddle",
-			"style": {
-				"navigationBarTitleText": "直播分享"
-			}
-		},
-		{
 			"path": "pages/nearbyDetails/nearbyDetails",
 			"style": {
 				"navigationBarTitleText": "店铺详情"
 			}
-		},
-		{
-			"path": "pages/shop/shop",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "小店团"
-			}
 		}
 	],
 	"tabBar": {
@@ -250,30 +185,6 @@
 					}
 				},
 				{
-					"path": "logistics/logistics",
-					"style": {
-						"navigationBarTitleText": "查看物流"
-					}
-				},
-				{
-					"path": "comments/comments",
-					"style": {
-						"navigationBarTitleText": "发表评价"
-					}
-				},
-				{
-					"path": "collect/collect",
-					"style": {
-						"navigationBarTitleText": "收藏"
-					}
-				},
-				{
-					"path": "remind/remind",
-					"style": {
-						"navigationBarTitleText": "开团提醒"
-					}
-				},
-				{
 					"path": "address/address",
 					"style": {
 						"navigationBarTitleText": "收货地址"
@@ -292,18 +203,6 @@
 					}
 				},
 				{
-					"path": "coupons/coupons",
-					"style": {
-						"navigationBarTitleText": "优惠券"
-					}
-				},
-				{
-					"path": "footprint/footprint",
-					"style": {
-						"navigationBarTitleText": "足迹"
-					}
-				},
-				{
 					"path": "help/help",
 					"style": {
 						"navigationBarTitleText": "帮助中心"
@@ -366,23 +265,6 @@
 					}
 				},
 				{
-					"path": "deliverExtend/deliverExtend",
-					"style": {
-						"navigationBarTitleText": "查看分单"
-					}
-				}, {
-					"path": "shop/shop",
-					"style": {
-						"navigationBarTitleText": "我的小店"
-					}
-				},
-				{
-					"path": "invoice/invoice",
-					"style": {
-						"navigationBarTitleText": "我的发票"
-					}
-				},
-				{
 					"path": "update/index",
 					"style": {
 						"navigationBarTitleText": "更新头像昵称"
@@ -462,12 +344,7 @@
 					"style": {
 						"navigationBarTitleText": "更改名称/地址"
 					}
-				}, {
-					"path": "cellSearch/cellSearch",
-					"style": {
-						"navigationBarTitleText": "搜索"
-					}
-				},
+				}, 
 				{
 					"path": "cellDetail/cellDetail",
 					"style": {
@@ -478,6 +355,11 @@
 					"style": {
 						"navigationBarTitleText": "BMS信息"
 					}
+				},{
+					"path": "map/map",
+					"style": {
+						"navigationBarTitleText": ""
+					}
 				}
 			]
 		}

pages/cart/cart.css

@@ -1,118 +0,0 @@
-/* pages/cart/cart.wxss */
-.page{padding: 0 20rpx 105rpx;}
-.cart{margin: 20rpx 0 0;background: #fff;border-radius: 10rpx;}
-.dian{height: 99rpx;border-bottom: 2rpx solid #E5E5E5;padding: 0 20rpx;align-items: center;}
-.dian view{font-size: 30rpx;color: #333;font-weight: bold;white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;}
-.dian .merchantName{width: 300rpx;}
-.list .li{display: flex;display: -webkit-flex;align-items: center;background: #fff;border-radius: 10rpx;padding: 0 20rpx 20rpx 14rpx;}
-.info{border-bottom: 2rpx solid #efefef;padding: 20rpx 0;overflow: hidden;}
-.checkbox{width: 54rpx;height: 180rpx;}
-.check{display: block;width: 34rpx;height: 34rpx;margin-top: 73rpx;}
-.dian .check{margin-top: 0;margin-right: 20rpx;}
-.cimgs{position: relative;width: 180rpx;height: 180rpx;box-sizing: border-box;border: 2rpx solid #E5E5E5;border-radius: 10rpx;margin-right: 20rpx;}
-.type{width: 82rpx;height: 36rpx;position: absolute;top: 2rpx;left:2rpx;}
-.cimg{width: 100%;height: 100%;}
-.gys{text-align: center;position: absolute;top: 140rpx;background: rgba(0,0,0,.6);width: 179rpx;color: white;}
-.zhinfo{flex:1;-webkit-flex: 1;overflow: hidden;position: relative;}
-.list .li:last-child .info{border-bottom: none;}
-.zhtit{font-size: 30rpx;color: #212121;line-height: 34rpx;text-overflow: ellipsis;white-space: nowrap;overflow: hidden;}
-.guigecontent{  
-  margin-top: 5rpx;
-  font-size: 22rpx;color: #999;
-  display: flex;  
-  flex-direction: row;  
-  /* width: 58%; */
-}
-.guige{font-size: 22rpx;color: #999;}
-.jiage{display: flex;display: -webkit-flex;align-items: center;justify-content: space-between;margin-top: 45rpx;}
-.zhjia{font-size: 36rpx;color: #FE0419;}
-.zhjia text{font-size: 28rpx;}
-.num{height: 55rpx;border: 1rpx solid #E5E5E5;border-radius: 8rpx;box-sizing: border-box;display: flex;display: -webkit-flex;align-items: center;text-align: center;}
-.jian{display: block;width: 53rpx;height: 53rpx;line-height: 45rpx;font-size: 30rpx;color: #333;font-weight: bold;}
-.nums{display: block;height: 52rpx;line-height: 53rpx;font-size: 28rpx;color: #333;width: 66rpx;background: #fff;border-left: 1rpx solid #E5E5E5;border-right: 1rpx solid #E5E5E5;border-radius: 6rpx;}
-.bot{background: #fff;height: 85rpx;position: fixed;left: 0;right: 0;bottom: 115rpx;z-index: 80;display: flex;display: -webkit-flex;align-items: center;border-bottom: 1rpx solid #fafafa;}
-.botl{flex: 1;-webkit-flex: 1;display: flex;display: -webkit-flex;padding: 0 0 0 20rpx;align-items: center;}
-.botl .check{margin-top: 0;margin-right: 10rpx;}
-.all{display: flex;display: -webkit-flex;align-items: center;font-size: 24rpx;color: #6a6a6a;}
-.heji{line-height: 85rpx;font-size: 27rpx;color: #333;margin-left: 20rpx;}
-.heji text{color: #e80113;font-size: 40rpx;font-weight: bold;}
-.editc{height: 85rpx;line-height: 85rpx;padding: 0 30rpx;background: #EA452E;}
-.edit{font-size: 26rpx;color: #fff;}
-.jiesuan{width: 172rpx;height: 85rpx;line-height: 85rpx;background: var(--mina);font-size: 26rpx;color: #fff;text-align: center;}
-.top{justify-content: space-between;align-items: center;}
-.more{width: 16rpx;height: 25rpx; margin-left: 7rpx;}
-.gocou{margin-left: 10rpx; color:#333 !important ;font-size: 26rpx !important;align-items: center;}
-.tbg{font-size: 26rpx !important; font-weight: normal !important; align-items: center; color: #999 !important;}
-.putong{margin-top: 30rpx;}
-
-.price .vip {
-  font-size: 24rpx;
-  margin-left: 12rpx;
-    color: var(--vip);
-	border: 1rpx solid;
-	padding: 0 8rpx 2rpx 8rpx;
-	border-radius: 5px;
-    font-weight: normal;
-}
-.price .vip .members{
-	font-size: 24rpx !important;
-	font-weight: normal !important;
-	margin-left: 2rpx;
-}
-.price .vip .sale{
-	font-size: 24rpx !important; 
-	font-weight: normal !important;
-}
-.mbggrays {
-  background: linear-gradient(0deg, #e0e0e0, #c4c4c4) !important;
-}
-.tabe{
-  font-size: 24rpx;
-  color: #999;
-  line-height: 40rpx;
-  margin-top: 15rpx;
-}
-.tabe text{margin-left: 20rpx;}
-.tabe text:first-child{margin-left:0rpx}
-
-/* 猜你喜欢 */
-.cai{padding-bottom: 30rpx;}
-.cai-tit{align-items: center;justify-content: center;font-size: 30rpx;color: #EA6730;font-weight: bold;margin-bottom: 30rpx;}
-.cai-tit image{width: 63rpx;height: 5rpx;}
-.cai-tit image:first-child{margin-right: 20rpx;}
-.cai-tit image:last-child{margin-left: 20rpx;}
-.tabcon{flex-wrap: wrap;}
-.tabcon .li{background: #fff;border-radius: 10rpx;width: 345rpx;margin: 20rpx 20rpx 0 0;}
-.tabcon .li:nth-child(2n){margin-right: 0;}
-.jsdimgs{width: 345rpx;height: 345rpx;position: relative;}
-.jsdpro{width: 100%;height: 100%;}
-.jsdimg{width: 82rpx;height: 36rpx;position: absolute;top: 20rpx;left: 20rpx;}
-.jsdinfo{padding: 15rpx 20rpx 30rpx;}
-.proname{font-size: 28rpx;color: #333;/* text-overflow: ellipsis;white-space: nowrap; */line-height: 36rpx;height: 72rpx;overflow: hidden;}
-.operate{justify-content: space-between;align-items: center;margin-top: 15rpx;}
-.price{font-size: 24rpx;color: #FE0419;  align-items: center;
-  display: flex;}
-  
-.price text{font-size: 36rpx;font-weight: bold;}
-.price .del{font-weight: normal;font-size: 24rpx;color: #999;margin-left: 12rpx;text-decoration: line-through;}
-.add-cart image{width: 42rpx;height: 42rpx;}
-
-
-.integral{color: #FE0419;}
-.integral .intnum{font-size: 36rpx;}
-.integral .money{font-size: 28rpx;}
-
-.wei-login{font-size: 24rpx;color: #333;text-align: center;padding: 0 30rpx 60rpx;}
-.wei-login image{width: 495rpx;height: 424rpx;margin: 0 auto 20rpx;}
-.cart-login{border: 1rpx solid var(--mina);font-size: 30rpx;color: var(--mina);font-weight: bold;height: 80rpx;line-height: 80rpx;border-radius: 40rpx;width: 260rpx;margin: 65rpx auto 0;}
-
-.yishou {font-size: 24rpx;color: #999;clear: both;overflow: hidden;white-space: nowrap;}
-
-.list-tag{margin-top: 15rpx;height: 32rpx;}
-.list-tag view {height: 30rpx;border: 1px solid var(--main);border-radius: 6rpx;padding: 0 7rpx;font-size: 20rpx;color: var(--main);margin-right: 10rpx;}
-.xiaol{margin-top: 15rpx;flex-wrap: nowrap;}
-.vip-news{height: 36rpx;background: #222222;border-radius: 8rpx;line-height: 36rpx;flex-wrap: nowrap;margin-right: 12rpx;font-weight: bold;}
-.vip-sale{background: linear-gradient(to right,#f9e0bc,#d9a168);font-size: 20rpx !important;color: #222;height: 36rpx;border-radius: 8rpx 0 0 8rpx;white-space: nowrap;width: 70rpx;text-align: center;}
-.vip-members{padding: 0 8rpx 0 5rpx;font-size: 22rpx !important;color: #fde9cd !important;white-space: nowrap;}

pages/cart/cart.vue

@@ -1,1511 +0,0 @@
-<template>
-	<view>
-		<!--pages/cart/cart.wxml-->
-		<view class="page">
-			<block v-for="(item, index) in pageList" :key="index">
-				<!-- <view class="cart" wx:if="{{item.isTimely == 1 && item.list.length > 0}}">
-			<view class="dian dflex">
-				<image src="{{item.isActive ? '/pages/images/gou_h.png' : '/pages/images/gou.png'}}" class="check" data-index="{{index}}"
-					bindtap="checkProduct"></image>
-				<view class="flex">及时达</view>
-			</view>
-			<view class="list">
-				<block wx:for="{{item.list}}" wx:key="index" wx:for-index="idx">
-					<view class="li">
-						<view class="checkbox" data-index="0" data-idx="{{idx}}" data-store="{{item.store}}"
-							bindtap="checkProduct">
-							<image src="{{item.isActive ? '/pages/images/gou_h.png' : '/pages/images/gou.png'}}" class="check">
-							</image>
-						</view>
-						<view class="info dflex flex">
-							<view class="cimgs" bindtap="toDetail" data-id="{{item.productId}}">
-								<image src="{{item.pic}}" mode="aspectFit" class="cimg"></image>
-								<image src="/pages/images/jishida.png" class="type"></image>
-							</view>
-							<view class="zhinfo">
-								<view class="zhtit {{item.store <= 0|| item.isInvalid?'color999':''}}" bindtap="toDetail"
-									data-id="{{item.productId}}">
-									{{item.title}} {{item.store<=0?'已售罄':item.isInvalid?'已下架':''}}({{item.merchantName}}及时达)</view>
-								<view wx:if="{{item.baseModelList}}" class="guigecontent">规格：
-									<text wx:for="{{item.baseModelList}}" wx:for-item="itemGuige" class="guige"
-										decode="{{true}}">{{itemGuige.value}}&nbsp;
-									</text>
-								</view>
-								<view class="jiage">
-									<view class="zhjia" bindtap="toDetail" data-id="{{item.productId}}"><text>￥</text>{{item.price}}
-									</view>
-									<view class="num">
-										<view class="jian" bindtap="jianQuantity" data-index="{{0}}" data-idx="{{index}}">-</view>
-										<text class="nums">{{item.quantity}}</text>
-										<view class="jian" bindtap="jiaQuantity" data-index="{{0}}" data-idx="{{index}}">+</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</block>
-			</view>
-		</view> -->
-				<!-- 普通产品 -->
-				<view class="cart" v-if="item.list.length > 0">
-					<view class="dian dflex">
-						<image :src="item.isActive ? '/static/pages/images/gou_h.png' : '/static/pages/images/gou.png'"
-							class="check" :data-merchantId="item.merchantId" :data-index="index" @tap="checkProduct">
-						</image>
-						<view class="flex dflex top" v-if="item.isTimely==0">
-							<view class="merchantName">{{item.shopName?item.shopName:item.merchantName}}</view>
-							<block v-if="!isEdit">
-								<block v-if="about.Min_Order_Money&&item.merchantMoney>0">
-									<view class="dflex">
-										<view class="tbg">还差{{item.merchantMoney}}元下单</view>
-										<!-- <navigator class="tbg dflex gocou" url="/pages/index/index" open-type="switchTab">去凑单<image src="/pages/images/more.png" class="more"></image></navigator> -->
-										<view class=" dflex gocou" @tap="goindex">去凑单 <image
-												src="/static/pages/images/more.png" class="more">
-											</image>
-										</view>
-									</view>
-								</block>
-								<block v-else>
-									<view class="dflex" v-if="about.Express_Fee>0">
-										<view class="tbg" v-if="item.freeShipping >0">还差{{item.freeShipping }}元包邮</view>
-										<view v-if="item.freeShipping >0" class=" dflex gocou" @tap="goindex">去凑单 <image
-												src="/static/pages/images/more.png" class="more"></image>
-										</view>
-										<view v-else class="tbg">已免运费</view>
-										<!-- <view>{{item.freeShipping }}</view> -->
-									</view>
-								</block>
-							</block>
-						</view>
-						<view class="flex" v-if="item.isTimely==1">{{item.shopName?item.shopName:item.merchantName}}及时达
-						</view>
-					</view>
-					<view class="list">
-						<block v-for="(item, idx) in item.list" :key="idx">
-							<view class="li">
-								<view class="checkbox" :data-index="index" :data-idx="idx" :data-store="item.store"
-									@tap="checkProduct">
-									<image
-										:src="item.isActive ? '/static/pages/images/gou_h.png' : '/static/pages/images/gou.png'"
-										class="check">
-									</image>
-								</view>
-								<view class="info dflex flex">
-									<view class="cimgs" @tap="toDetail" :data-id="item.productId"
-										:data-merchant="item.merchantId" :data-type="item.activityType" :data-actid="item.activityProductId">
-										<image :src="item.pic+ '?x-oss-process=style/w160'" class="cimg"></image>
-										<image src="/static/pages/images/jishida.png" class="type"
-											v-if="item.isJs&&!item.activityType"></image>
-										<image src="/static/pages/images/tuangou.png" class="type"
-											v-if="item.activityType==1"></image>
-										<image src="/static/pages/images/seckill.png" class="type"
-											v-if="item.activityType==2"></image>
-										<image src="/static/pages/images/newbornZone.png" class="type"
-											v-if="item.activityType==4"></image>
-
-										<view class="gys" v-if="item.store<=0">已售罄</view>
-										<view class="gys" v-else-if="item.isInvalid">已下架</view>
-										<view class="gys" v-else-if="item.activityState===1">活动进行中</view>
-										<view class="gys" v-else-if="item.activityState===0">活动已结束</view>
-										<!-- <view class="gys" wx:if="{{item.store<=0||item.isInvalid}}">{{item.store<=0?'已售罄':item.isInvalid?'已下架':''}}</view> -->
-									</view>
-									<view class="zhinfo">
-										<view :class="'zhtit ' + (item.store <= 0|| item.isInvalid?'color999':'')"
-											@tap="toDetail" :data-id="item.productId" :data-merchant="item.merchantId"
-											:data-type="item.activityType" :data-actid="item.activityProductId">
-											{{item.title}}
-										</view>
-
-										<view v-if="item.baseModelList" class="guigecontent">规格：
-											<text v-for="(itemGuige,index) in item.baseModelList" class="guige"
-												:decode="true" :key="index">{{itemGuige.value}}&nbsp;
-											</text>
-										</view>
-
-										<view class="jiage"
-											:style="item.baseModelList||item.activityState===0||item.store<=0||item.isInvalid?'margin-top: 14rpx;':''">
-											<view class="zhjia" @tap="toDetail" :data-id="item.productId"
-												:data-merchant="item.merchantId" :data-actid="item.activityProductId" v-if="!integralshop">
-												<text>￥</text>{{item.price}}
-											</view>
-											<view class="integral" v-if="integralshop"><text
-													class="intnum">{{item.integral}}积分</text><text
-													class="money">+￥{{item.price}}</text></view>
-											<view class="num">
-												<view class="jian" @tap="jianQuantity" :data-index="index"
-													:data-idx="idx">-</view>
-												<input class="nums" :value="item.quantity" type="number" @input="getNum"
-													@blur="minNum" :data-index="index" :data-idx="idx" />
-												<view class="jian" @tap="jiaQuantity" :data-index="index"
-													:data-idx="idx">+</view>
-											</view>
-										</view>
-										<view class="tabe dflex"><text v-for="(it, index) in item.tabe"
-												:key="index">{{it}}</text></view>
-									</view>
-								</view>
-							</view>
-						</block>
-					</view>
-				</view>
-			</block>
-		</view>
-		<block v-if="ishow">
-		<view class="nodata_cart">
-			<image :src="picUrlss + 'null.png'"></image>
-			<view>购物车是空的</view>
-			<navigator :url="header.appId=='ZQ1VK5oc17I387E'?'/pages/timelyDelivery/index':'/pages/index/index'"
-				open-type="switchTab">去逛逛</navigator>
-		</view>
-		</block>
-		<view class="wei-login" v-if="!isLogin">
-			<image :src="picUrlss + 'wei_login.png'"></image>
-			<view>暂未登录</view>
-			<navigator url="/pages/authorize/authorize" hover-class="none" class="cart-login">立即登录</navigator>
-		</view>
-		<view class="cai pdlr20" v-if="likeList.length>0">
-			<view class="cai-tit dflex">
-				<image src="/static/pages/images/cai_bg1.png"></image>猜您喜欢<image
-					src="/static/pages/images/cai_bg2.png"></image>
-			</view>
-			<view class="tabcon dflex">
-				<block v-for="(item, index) in likeList" :key="index">
-					<view class="li">
-						<view class="jsdimgs" @tap="toDetail" :data-id="item.id">
-							<image :src="item.pic + '?x-oss-process=style/w210'" mode="aspectFit" class="jsdpro">
-							</image>
-							<image src="/static/pages/images/jishida.png" v-if="item.isJs" class="jsdimg"></image>
-						</view>
-						<view class="jsdinfo">
-							<view class="proname" @tap="toDetail" :data-id="item.id">{{item.title}}</view>
-							<view class="list-tag ddflex">
-								<block v-if="item.label">
-								<view v-for="(it,idx) in item.label.split(',')" :key="idx" v-if="idx < 2">{{it}}</view>
-								</block>
-							</view>
-							<view class="xiaol ddflex">
-								<view class="vip-news ddflex" v-if="about.show_membership_price==1&&item.actualPrice < item.salePrice"><text class="vip-sale">会员价</text><text class="vip-members">￥{{item.actualPrice}}</text></view>
-								<view class="vip-news ddflex" v-if="about.show_membership_price==1&&item.membersPrice<item.salePrice"><text class="vip-sale">会员价</text><text class="vip-members">￥{{item.membersPrice}}</text></view>
-								<view class="yishou">{{item.sellStock}}件已售</view>
-							</view>
-							<view class="operate dflex">
-								<view class="price proprice">
-									￥<text>{{item.salePrice}}</text>
-									<!-- <text class="vip" v-if="about.show_membership_price==1&&item.actualPrice < item.salePrice"><text class="sale">VIP</text><text class="members">{{item.actualPrice}}</text></text>
-									<text class="vip"
-										v-if="about.show_membership_price==1&&item.membersPrice<item.salePrice"><text
-											class="sale">VIP</text><text
-											class="members">{{item.membersPrice}}</text></text> -->
-									<text class="del"><!-- v-if="about.show_membership_price!=1" -->
-										<block v-if="item.marketPrice!=0&&item.marketPrice>item.salePrice">
-											￥{{item.marketPrice}}
-										</block>
-									</text>
-								</view>
-								<view class="add-cart">
-									<view class="nums dflex" v-if="item.count > 0">
-										<image src="/static/pages/images/jian.png"></image>
-										<view class="num">{{item.count}}</view>
-										<image src="/static/pages/images/jia1.png"></image>
-									</view>
-									<image src="/static/pages/images/jia.png" @tap="addShopCart" :data-id="item.id"
-										:data-skuid="item.skuId" :data-index="index" :data-state="item.state"
-										v-else></image>
-								</view>
-							</view>
-						</view>
-					</view>
-				</block>
-			</view>
-		</view>
-		<view class="bot savepadding" v-if="pageList.length > 0">
-			<view class="botl">
-				<view class="dflex flex">
-					<view class="all" data-index="-1" @tap="checkProduct">
-						<image :src="isAll ? '/static/pages/images/gou_h.png' : '/static/pages/images/gou.png'"
-							class="check"></image>
-						全选
-					</view>
-					<view class="heji flex" v-if="!isEdit&&!integralshop">总计：<text>￥{{money}}</text></view>
-					<view class="heji flex" v-if="!isEdit&&integralshop">总计：<text>{{integral}}积分+￥{{money}}</text>
-					</view>
-				</view>
-				<view class="editc">
-					<text class="edit" @tap="edit">{{isEdit ? '完成' : '编辑'}}</text>
-				</view>
-			</view>
-			<view class="jiesuan" @tap="deleteCart" v-if="isEdit">删除({{count}})</view>
-			<view class="jiesuan" @tap="Settlement" v-else>去结算({{count}})</view>
-		</view>
-
-
-		<!-- <view class="placeholder-view" :style="'height:' + (bottomBlankHeignt + 115) + 'rpx'"></view> -->
-		<view class="savepadding"></view>
-		<foot channel="cart" :product-type="integralshop?2:1" :isUpdate="isUpdate"></foot>
-	</view>
-</template>
-
-<script>
-	const app = getApp();
-	const req = require("../../utils/request.js");
-	let commodity = [];
-	let merchantArr = [];
-	let deliverWay = [];
-	let ativityType = [];
-	import foot from "../../components/nav-bar/index";
-
-	export default {
-		data() {
-			return {
-				picUrlss: req.public.picUrls,
-				bottomBlankHeignt: app.globalData.isIPhoneX ? 68 : 0,
-				form: {},
-				pageList: [],
-				page: 1,
-				likeList: [],
-				isLoad: true,
-				isLikeLoad: true,
-				isAll: false,
-				isJsdAll: false,
-				isCgAll: false,
-				money: 0.00,
-				count: 0,
-				isEdit: false,
-				isUpdate: false,
-				// 是否更新消息
-				merchant: {},
-				integral: 0,
-				integralshop: false,
-				shopName: "",
-				show_membership_price: 0,
-				ishow: false,
-				header: req.header,
-				isLogin: false,
-				about: {}
-			};
-		},
-
-		components: {
-			foot
-		},
-		props: {},
-
-		onLoad(options) {
-			this.query = options;
-
-			if (options.integralshop == 1) {
-				this.setData({
-					integralshop: true
-				});
-			}
-
-			// console.log(options);
-			this.getLikeList();
-		},
-
-		onShow: function() {
-			let _ts = this;
-			let userInfo = req.getStorage('userInfo');
-			if(userInfo) _ts.isLogin = true;
-			this.getConfig();
-
-			_ts.setData({
-				isUpdate: !_ts.isUpdate
-			}); // if (req.getStorage("MERCHANT").isDefault != 1) {
-			//   req.getRequest('/api/merchant/getMerchantList', {}, res => {
-			//     res = res.filter(it => it.isDefault == 1)
-			//     console.log(res)
-			//     this.data.merchant = res[0]
-			//   })
-			// } else {
-			// this.data.merchant = req.getStorage("MERCHANT");
-			//默认门店
-			// if (req.getStorage("defaultMerchant") != "") {
-			// 	this.merchant = req.getStorage("defaultMerchant")
-			// }
-			//用户选择的门店
-			if (req.getStorage("MERCHANT") != "") {
-				this.merchant = req.getStorage("MERCHANT")
-			}
-			// }
-
-			this.isLoad = true;
-			this.setData({
-				count: 0,
-				money: 0,
-				shopName: this.merchant.title,
-				isEdit: false
-			});
-			if(_ts.isLogin){
-				this.getList();
-			}
-		},
-
-		onHide() {
-			this.query.integralshop = 0;
-			this.setData({
-				integralshop: false
-			});
-		},
-
-		methods: {
-			toDetail(e) {
-				// console.log(e, "123132456")
-				let id = e.currentTarget.dataset.id;
-				let merchantId = e.currentTarget.dataset.merchant
-				let actId=e.currentTarget.dataset.actid
-				let url = 'product/detail/detail?id=' + id
-				let type = e.currentTarget.dataset.type
-				if (!type) {
-					if (merchantId) {
-						app.globalData.openPage(url + '&merchantId=' + merchantId)
-					} else {
-						app.globalData.openPage('product/detail/detail?id=' + id);
-					}
-				} else if (type == 1) {
-					app.globalData.openPage('product/groupDetail/groupDetail?acid=' + actId + "&id=" + id +
-						'&merchantId=' + merchantId)
-				} else if (type == 2) {
-					app.globalData.openPage('activity/seckillDetails/seckillDetails?acid=' + actId + "&id=" + id +
-						'&merchantId=' + merchantId)
-				} else if (type == 4) {
-					app.globalData.openPage('activity/newbornDetails/newbornDetails?acid=' + actId + "&id=" + id +
-						'&merchantId=' + merchantId)
-				}
-
-
-			},
-
-			getConfig() {
-				var _this = this;
-
-				return new Promise((resolve, reject) => {
-					req.getRequest('/api/config', {}, function(res) {
-						if (res && res.show_membership_price == 1) {
-							_this.setData({
-								show_membership_price: 1
-							});
-						}
-						if (res) {
-							_this.setData({
-								about: res
-							});
-						}
-
-						resolve();
-					});
-				});
-			},
-
-			addShopCart(e) {
-				let state = e.currentTarget.dataset.state;
-				let skuId = e.currentTarget.dataset.skuid;
-				let id = e.currentTarget.dataset.id;
-				let params = {
-					skuId: skuId,
-					quantity: 1,
-					productId: id
-				};
-				// if(state!=1){
-				//   return req.msg('您来晚了，商品已经下架')
-				// }
-
-				if (this.merchant) {
-					params.merchantId = this.merchant.id;
-				}
-
-				req.postRequest('/api/purchase/cart', params, res => {
-					req.msg('加入购物车成功');
-					this.setData({
-						isUpdate: !this.isUpdate
-					});
-					this.isLoad = true;
-					this.getList();
-				});
-			},
-
-			getList() {
-				let isShowLoading = false;
-
-				if (this.form.page == 1 && !isShowLoading) {
-					req.loadIng('加载中');
-					isShowLoading = true;
-				} // if (!this.data.isLoad) return false;
-
-
-				this.isLoad = false;
-				let that = this;
-				let newList = [];
-				// console.log(this.query.integralshop);
-
-				if (this.query.integralshop == 1) {
-					this.form.purchaseType = 2;
-				} else {
-					this.form.purchaseType = 1;
-				}
-				if(this.merchant){
-					this.form.merchantId = this.merchant.id;
-				}
-				// console.log(this.form);
-				req.getRequest('/api/purchase/list', this.form, data => {
-					data = data.map(it => {
-						let arr = ['自提', '邮寄', '同城配送', '自主配送'];
-						let tabe = [];
-						let deliverWays = JSON.parse(it.deliverWay);
-						deliverWays.forEach(it => {
-							tabe.push(arr[it - 1]);
-						});
-
-						if (it.isOtc == 5) {
-							it.tabe = ['邮寄'], it.deliverWay = "[2]";
-						} else {
-							it.tabe = tabe;
-						}
-
-						if (it.deliverWay && JSON.parse(it.deliverWay).indexOf(3) != -1) it.isJs = true;
-						return it;
-					});
-					// console.log(data);
-					data = data.map(it => {
-						if (it.deliverWay && JSON.parse(it.deliverWay).indexOf(3) != -1) it.isJs = true;
-						return it;
-					});
-
-					if (this.query.integralshop == 1) {
-						data = data.filter(it => it.productType == 2);
-					}
-
-					commodity.forEach(it => {
-						data.forEach(el => {
-							if (it.id == el.id && !el.isInvalid && it.deliverWay == el
-								.deliverWay) {
-								el.isActive = true;
-							}
-						});
-					});
-					this.setData({
-						count: commodity.length
-					});
-					let params = []; // 1及时达产品
-
-					// params.push({
-					// 	isTimely: 1,
-					// 	isActive: false,
-					// 	list: data.filter(it => {
-					// 		if (JSON.parse(it.deliverWay) && JSON.parse(it.deliverWay).indexOf(3) != -1) return it;
-					// 	})
-					// }); // 0常规产品
-
-					params.push({
-						isTimely: 0,
-						list: data
-					});
-					// console.log(params); //  常规产品
-
-					params[0].list.forEach(el => {
-						if (el.merchantId == "" || el.merchantId == null) {
-							let merchant = this.merchant; // let merchant = req.getStorage('MERCHANT');
-
-							el.merchantId = merchant.id;
-							el.merchantName = merchant.title;
-						}
-						if (newList.length == 0) {
-							newList.push({
-								merchantId: el.merchantId,
-								merchantName: el.merchantName,
-								isTimely: 0,
-								isActive: false,
-								list: [el],
-								shopId: el.shopId,
-								shopName: el.shopName,
-								merchantMoney: this.about.Min_Order_Money?this.about.Min_Order_Money:0,
-								freeShipping: this.about.Free_Shipping
-							});
-						} else {
-							let res = newList.some(item => {
-								if (item.merchantId == el.merchantId && item.shopId == el.shopId) {
-									item.list.push(el);
-									return true;
-								}
-							});
-
-							if (!res) {
-								newList.push({
-									merchantId: el.merchantId,
-									isTimely: 0,
-									merchantName: el.merchantName,
-									isActive: false,
-									list: [el],
-									shopId: el.shopId,
-									shopName: el.shopName,
-									merchantMoney: this.about.Min_Order_Money?this.about.Min_Order_Money:0,
-									freeShipping: this.about.Free_Shipping
-								});
-							}
-						}
-					});
-					let jsd = [];
-					// params[0].list.forEach(el => {
-					// 	if (el.merchantId == "" || el.merchantId == null) {
-					// 		console.log(el); // let merchant = req.getStorage('MERCHANT');
-
-					// 		let merchant = this.merchant;
-					// 		el.merchantId = merchant.id;
-					// 		el.merchantName = merchant.title;
-					// 	}
-
-					// 	if (jsd.length == 0) {
-					// 		jsd.push({
-					// 			merchantId: el.merchantId,
-					// 			merchantName: el.merchantName,
-					// 			isTimely: 1,
-					// 			isActive: false,
-					// 			list: [el],
-					// 			shopId: el.shopId,
-					// 			shopName: el.shopName
-					// 		});
-					// 	} else {
-					// 		let res = jsd.some(item => {
-					// 			if (item.merchantId == el.merchantId && item.shopId == el.shopId) {
-					// 				item.list.push(el);
-					// 				return true;
-					// 			}
-					// 		});
-
-					// 		if (!res) {
-					// 			jsd.push({
-					// 				merchantId: el.merchantId,
-					// 				isTimely: 1,
-					// 				merchantName: el.merchantName,
-					// 				isActive: false,
-					// 				shopId: el.shopId,
-					// 				shopName: el.shopName,
-					// 				list: [el]
-					// 			});
-					// 		}
-					// 	}
-					// }); 
-
-					newList = newList.concat(jsd);
-					let i = 0;
-					newList.forEach(it => {
-						let arr = it.list.filter(el => el.isActive);
-						// console.log(arr, it.list.length);
-
-						if (arr.length == it.list.length) {
-							it.isActive = true;
-						}
-					});
-					let abb = newList.filter(res => res.isActive);
-					// console.log(abb, newList.length);
-
-					if (abb.length == newList.length && abb.length != 0) {
-						this.setData({
-							isAll: true
-						});
-					} else {
-						this.setData({
-							isAll: false
-						});
-					} // console.log(newList,i)
-					// newList.forEach(el => {
-					//   if (el.merchantId == '' || el.merchantName == '' || el.merchantName == null || el.merchantId == null) {
-					//     let merchant = req.getStorage('MERCHANT');
-					//     el.merchantId = merchant.id
-					//     el.merchantName = merchant.title
-					//     el.list.forEach(item => {
-					//       item.merchantId = merchant.id
-					//       item.merchantName = merchant.title
-					//       if (item.merchantId == el.merchantId) {
-					//         console.log(el)
-					//         // item.list.push(el.list)
-					//         // return true
-					//       }
-					//     })
-					//     console.log(el)
-					//   }
-					// })
-
-
-					that.setData({
-						pageList: newList
-					});
-					that.CalculationMoney();
-					if (this.pageList <= 0) {
-						that.setData({
-							ishow: true
-						});
-					} else {
-						that.setData({
-							ishow: false
-						});
-					}
-
-					if (isShowLoading) {
-						uni.hideLoading();
-						isShowLoading = false;
-					}
-				});
-			},
-
-			checkProduct(event) {
-				// debugger
-				//选择商品
-				const that = this;
-				const index = event.currentTarget.dataset.index;
-				const idx = event.currentTarget.dataset.idx;
-				const store = event.currentTarget.dataset.store;
-				const merchantId = event.currentTarget.dataset.merchantid;
-				let d = {};
-
-				if (idx == undefined) {
-					// console.log("进行全选和店铺全选");
-
-					if (index == -1) {
-						// 全选
-						// console.log("全选");
-						const isAll = that.isAll;
-						for (let i = 0, len = that.pageList.length; i < len; i++) {
-							for (let j = 0, len = that.pageList[i].list.length; j < len; j++) {
-								if (!this.isEdit) {
-									if (this.pageList[i].list[j].store <= 0) return req.msg(this.pageList[i].list[j]
-										.title + "商品已售罄");
-									if (this.pageList[i].list[j].isInvalid) return req.msg(this.pageList[i].list[j].title +
-										'商品已下架或失效');
-									if (this.pageList[i].list[j].activityState === 0) return req.msg(this.pageList[i].list[
-											j].title +
-										'活动已结束');
-									if (this.pageList.length > 1) return req.msg('门店与门店之间不能一起下单'); // 发货方式判断
-									if(this.pageList[i].list.every(it=>it.ativityType === this.pageList[i].list[0].ativityType)){
-									      return req.msg('活动商品不支持一起下单')
-									}
-									// 先存一个选择的发货方式
-									if (deliverWay.length < 1) {
-										deliverWay.push(JSON.parse(this.pageList[i].list[j].deliverWay));
-									}
-									// 先存一个选择的活动类型
-									let activityTypes = '';
-									if(!this.pageList[i].list[j].activityType){
-										activityTypes = 99;
-									}else{
-										activityTypes = this.pageList[i].list[j].activityType;
-									}
-									if (ativityType.length < 1) {
-										ativityType[0] = activityTypes;
-									}
-
-									let k = 0;
-									// console.log(deliverWay, this.getTheSame(
-										// deliverWay)); //  this.getTheSame 拿到重复的发货方式 去循环判断点击的发货方式里面存不存在这个共同的发货方式
-
-									this.getTheSame(deliverWay).forEach(it => {
-										if (JSON.parse(this.pageList[i].list[j].deliverWay).indexOf(it) == -1) {
-											this.fou = true;
-											// console.log("123");
-											this.CalculationMoney(index);
-										} else {
-											ativityType.map(it=>{
-												if (activityTypes != it) {
-													this.fou = true;
-												}else{
-													k++;
-													this.fou = false;
-												}
-											})
-											// k++;
-											// this.fou = false;
-										}
-									});
-
-									if (k > 0) {
-										this.fou = false;
-									}
-
-									// console.log(k);
-								}
-
-								if (!that.pageList[i].list[j].isInvalid) {
-									this.pageList.some(item => {
-										if (item.merchantId == this.pageList[i].merchantId) {
-											if (merchantArr.length > 0) {
-												if (merchantArr[0] != this.pageList[i].merchantId) {
-													// return false
-													let res = this.pageList.map(it => {
-														if (it.isActive) {
-															it.isActive = !it.isActive;
-														}
-
-														it.merchantMoney = 0;
-														it.list.map(el => {
-															if (el.isActive) {
-																el.isActive = !el.isActive;
-																return el;
-															}
-														});
-														return it;
-													});
-													merchantArr.splice(0, 1, this.pageList[i].merchantId);
-													this.setData({
-														pageList: res
-													});
-												}
-											} else {
-												merchantArr.push(item.merchantId);
-											}
-										}
-									});
-								}
-								if (this.fou) {
-									return req.msg('暂不支持一起下单');
-								} else {
-									// console.log("545");
-									d['pageList[' + i + '].list[' + j + '].isActive'] = !isAll;
-									d['pageList[' + i + '].isActive'] = !isAll;
-								}
-							}
-						}
-
-						d['isAll'] = !isAll;
-
-					} else {
-						for (let i = 0, len = this.pageList[index].list.length; i < len; i++) {
-							if (!this.isEdit) {
-								if (this.pageList[index].list[i].store <= 0) return req.msg(this.pageList[index].list[i]
-									.title + "商品已售罄");
-								if (this.pageList[index].list[i].isInvalid) return req.msg(this.pageList[index].list[i]
-									.title + '商品已下架或失效');
-								if (this.pageList[index].list[i].activityState === 0) return req.msg(this.pageList[index]
-									.list[i]
-									.title +
-									'活动已结束');
-								// 发货方式判断
-								// 先存一个选择的发货方式
-								// 判断是否切换了门店，切换了就清空deliverWay
-
-								if (this.pageList[index].merchantId != merchantArr[0]) {
-									deliverWay = [];
-								} // 判断deliverWay长度是否小于1，小于1就默认拿当前第一个产品的发货方式存进去
-
-
-								if (deliverWay.length < 1) {
-									deliverWay.push(JSON.parse(this.pageList[index].list[i].deliverWay));
-								} 
-								// 先存一个选择的活动类型
-								let activityTypes = '';
-								if(!this.pageList[index].list[i].activityType){
-									activityTypes = 99;
-								}else{
-									activityTypes = this.pageList[index].list[i].activityType;
-								}
-								if (ativityType.length < 1) {
-									ativityType[0] = activityTypes;
-								}
-								// 设置j标识
-
-
-								let j =
-									0; //  this.getTheSame 拿到重复的发货方式 去循环判断点击的发货方式里面存不存在这个共同的发货方式 不存在就提示用户不能一起下单，存在就j++，只要j大于0就说明有共同的发货方式
-
-								this.getTheSame(deliverWay).forEach(it => {
-									if (JSON.parse(this.pageList[index].list[i].deliverWay).indexOf(it) == -1) {
-										this.fou = true;
-										this.CalculationMoney(index);
-									} else {
-										ativityType.map(it=>{
-											if (activityTypes != it) {
-												this.fou = true;
-											}else{
-												j++;
-												this.fou = false;
-											}
-										})
-										// j++;
-										// this.fou = false;
-									}
-								});
-
-								if (j > 0) {
-									this.fou = false;
-								}
-							}
-
-							if (!this.pageList[index].list[i].isInvalid) {
-								this.pageList.some(item => {
-									if (item.merchantId == this.pageList[index].merchantId) {
-										if (merchantArr.length > 0) {
-											if (merchantArr[0] != this.pageList[index].merchantId) {
-												let res = this.pageList.map(it => {
-													if (it.isActive) {
-														it.isActive = !it.isActive;
-													}
-
-													it.merchantMoney = 0;
-													it.list.map(el => {
-														if (el.isActive) {
-															el.isActive = !el.isActive;
-															return el;
-														}
-													});
-													return it;
-												});
-												merchantArr.splice(0, 1, this.pageList[index].merchantId);
-												this.setData({
-													pageList: res
-												});
-											}
-										} else {
-											merchantArr.push(item.merchantId);
-										}
-									}
-								});
-							}
-
-							if (this.fou) {
-								return req.msg('暂不支持一起下单');
-							} else {
-								d['pageList[' + index + '].list[' + i + '].isActive'] = !this.pageList[index].isActive;
-								d['pageList[' + index + '].isActive'] = !this.pageList[index].isActive;
-							}
-
-						}
-					} // if (this.data.index == index) {
-					//   isJsdAll = this.data.isJsdAll
-					// }else{
-					//   isJsdAll=false
-					// }
-
-				} else {
-					// 单选
-					// console.log("单选");
-
-					if (!this.isEdit) {
-						if (this.pageList[index].list[idx].store <= 0) return req.msg(this.pageList[index].list[idx]
-							.title + "商品已售罄");
-						if (this.pageList[index].list[idx].isInvalid) return req.msg(this.pageList[index].list[idx].title +
-							'商品已下架或失效');
-						if (this.pageList[index].list[idx].activityState === 0) return req.msg(this.pageList[index].list[
-								idx].title +
-							'活动已结束');
-						// 发货方式判断
-						// 先存一个选择的发货方式
-
-						// console.log(deliverWay);
-
-						if (deliverWay.length < 1) {
-							deliverWay.push(JSON.parse(this.pageList[index].list[idx].deliverWay));
-						}
-						// 先存一个选择的活动类型
-						let activityTypes = '';
-						if(!this.pageList[index].list[idx].activityType){
-							activityTypes = 99;
-						}else{
-							activityTypes = this.pageList[index].list[idx].activityType;
-						}
-						if (ativityType.length < 1) {
-							ativityType[0] = activityTypes;
-						}
-						let i = 0;
-						// console.log(deliverWay); //  this.getTheSame 拿到重复的发货方式 去循环判断点击的发货方式里面存不存在这个共同的发货方式
-						this.getTheSame(deliverWay).forEach(it => {
-							if (JSON.parse(this.pageList[index].list[idx].deliverWay).indexOf(it) == -1) {
-								this.fou = true;
-							} else {
-								ativityType.map(it=>{
-									if (activityTypes != it) {
-										this.fou = true;
-									}else{
-										i++;
-										this.fou = false;
-									}
-								})
-								// i++;
-								// this.fou = false;
-							}
-						});
-
-						if (i > 0) {
-							this.fou = false;
-						}
-						// console.log(i);
-						// console.log(this.fou);
-					}
-
-					// 单独门店的最低消费和包邮计算
-					this.pageList.some(item => {
-						if (item.merchantId == this.pageList[index].merchantId) {
-							if (merchantArr.length > 0) {
-								if (merchantArr[0] != this.pageList[index].merchantId) {
-									// return false
-									let res = this.pageList.map(it => {
-										if (it.isActive) {
-											it.isActive = !it.isActive;
-										} else {
-											it.merchantMoney = 0;
-										}
-
-										it.list.map(el => {
-											if (el.isActive) {
-												el.isActive = !el.isActive;
-												return el;
-											}
-										});
-										return it;
-									});
-									merchantArr.splice(0, 1, this.pageList[index].merchantId);
-									this.setData({
-										pageList: res
-									});
-								}
-							} else {
-								merchantArr.push(item.merchantId);
-							}
-						}
-					});
-					if (this.fou) {
-						return req.msg('暂不支持一起下单');
-					} else {
-						d['pageList[' + index + '].list[' + idx + '].isActive'] = !this.pageList[index].list[idx].isActive;
-					}
-				}
-				
-				// console.log(d);
-				this.setData(d);
-				// console.log(this.pageList);
-				commodity = [];
-				this.pageList.forEach(it => {
-					it.list.forEach(el => {
-						if (el.isActive) {
-							commodity.push({
-								id: el.id,
-								deliverWay: el.deliverWay
-							});
-						}
-					});
-				});
-				// console.log(...new Set(commodity));
-
-				if (index != -1) {
-					this.merchantCheckProduct(index, idx);
-				}
-
-				this.CalculationMoney(index);
-			},
-			// 获取重复的配送方式值
-			getTheSame(arr) {
-				return arr.reduce(function(a, b) {
-					return a.filter(function(item) {
-						return b.includes(item);
-					})
-				})
-			},
-			// 获取重复的活动类型值
-			getTheSameType(arr) {
-				return arr.reduce(function(a, b) {
-					return a.filter(function(item) {
-						return b.includes(item);
-					})
-				})
-			},
-
-			// 判断店铺的商品是否全部选择
-			merchantCheckProduct(index, idx) {
-				let d = {}; // debugger
-
-				// console.log("=======================", this.pageList[index].list.filter(it => it.isActive).length == this
-					// .pageList[
-						// index].list.length, this.pageList.filter(it => it.isActive).length == this.pageList.length);
-				// console.log(this.pageList[index].list.filter(it => it.isActive))
-				if (this.pageList[index].list.filter(it => it.isActive).length == this.pageList[index].list.length) {
-					d['pageList[' + index + '].isActive'] = true;
-				} else {
-					d['pageList[' + index + '].isActive'] = false;
-					d['isAll'] = false;
-				}
-
-				this.setData(d);
-
-				if (this.pageList.filter(it => it.isActive).length == this.pageList.length) {
-					this.setData({
-						isAll: true
-					});
-				}
-			},
-
-			adjustmentQuantity(id, quantity, skuId, success) {
-				req.postRequest('/api/purchase/quantity', {
-					id: id,
-					skuId: skuId,
-					quantity: quantity
-				}, () => {
-					this.setData({
-						isUpdate: !this.isUpdate
-					});
-					success.call(this);
-				});
-			},
-
-			jianQuantity(event) {
-				const index = event.currentTarget.dataset.index;
-				const idx = event.currentTarget.dataset.idx;
-				const page = this.pageList[index].list[idx];
-				if (page.store <= 0) return req.msg(page.title + '已售罄');
-				if (page.isInvalid) return req.msg('商品已下架或失效');
-				if (page.activityState === 0) return req.msg('该活动已结束');
-				if (page.quantity <= 1) return false;
-				const q = parseInt(page.quantity) - 1;
-				let that = this;
-				this.adjustmentQuantity(page.id, q, page.skuId, () => {
-					let d = {};
-					d['pageList[' + index + '].list[' + idx + '].quantity'] = q;
-					this.getList();
-					that.setData(d);
-					// if (page.isActive) that.CalculationMoney();
-				});
-			},
-
-			jiaQuantity(event) {
-				const index = event.currentTarget.dataset.index;
-				const idx = event.currentTarget.dataset.idx;
-				const page = this.pageList[index].list[idx];
-				if (page.store <= 0) return req.msg(page.title + '已售罄');
-				if (page.isInvalid) return req.msg('商品已下架或失效');
-				if (page.activityState === 0) return req.msg('该活动已结束');
-				let q = parseInt(page.quantity) + 1;
-
-				if (page.maxBuy > 0) {
-					// console.log(page, q, "===========================");
-					if (q > page.maxBuy) return req.msg('非常的抱歉，本产品最多可购买' + page.maxBuy);
-					else {
-						q = parseInt(page.quantity) + 1;
-					}
-				}
-
-				let that = this;
-				this.adjustmentQuantity(page.id, q, page.skuId, () => {
-					let d = {};
-					d['pageList[' + index + '].list[' + idx + '].quantity'] = q;
-					that.setData(d);
-					this.getList();
-					// if (page.isActive) that.CalculationMoney();
-				});
-			},
-
-			// 获取输入的值
-			getNum(event) {
-				const index = event.currentTarget.dataset.index;
-				const idx = event.currentTarget.dataset.idx;
-				const page = this.pageList[index].list[idx];
-				if (page.store <= 0) {
-					req.msg(page.title + '已售罄');
-					return 1
-				} else if (page.isInvalid) {
-					req.msg('商品已下架或失效');
-					return 1
-				} else if (page.activityState === 0) {
-					req.msg('该活动已结束');
-					return 1
-				} else {
-					let q = event.detail.value;
-
-					if (page.maxBuy > 0) {
-						if (q > page.maxBuy) {
-							req.msg('非常的抱歉，本产品最多可购买' + page.maxBuy);
-							q = page.maxBuy;
-						} else {
-							q = event.detail.value;
-						}
-					}
-
-					let d = {};
-					d['pageList[' + index + '].list[' + idx + '].quantity'] = q;
-					this.setData(d);
-					return q
-				}
-				// if (page.isActive) this.CalculationMoney(); // let that = this;
-				// console.log(q)
-				// if(q!=''){
-				//   this.adjustmentQuantity(page.id, q, page.skuId, () => {
-				//     let d = {};
-				//     d['pageList[' + index + '].list[' + idx + '].quantity'] = q;
-				//     that.setData(d);
-				//     if (page.isActive) that.CalculationMoney();
-				//   })
-				// }
-			},
-
-			minNum(event) {
-				const index = event.currentTarget.dataset.index;
-				const idx = event.currentTarget.dataset.idx;
-				const page = this.pageList[index].list[idx];
-				let that = this;
-				if (page.store <= 0) {
-					req.msg(page.title + '已售罄');
-					return 1
-				} else
-				if (page.isInvalid) {
-					req.msg('商品已下架或失效');
-					return 1
-				} else
-				if (page.activityState === 0) {
-					req.msg('该活动已结束');
-					return 1
-				} else
-				if (event.detail.value == '') {
-					let q = 1;
-					this.adjustmentQuantity(page.id, q, page.skuId, () => {
-						let d = {};
-						d['pageList[' + index + '].list[' + idx + '].quantity'] = q;
-						that.setData(d);
-						// if (page.isActive) that.CalculationMoney();
-						this.getList();
-					});
-				} else {
-					let q = parseInt(event.detail.value);
-
-					if (q > page.store) {
-						req.msg('非常的抱歉，本产品库存量剩余' + page.store);
-						q = page.store;
-					}
-
-					this.adjustmentQuantity(page.id, q, page.skuId, () => {
-						let d = {};
-						d['pageList[' + index + '].list[' + idx + '].quantity'] = q;
-						that.setData(d);
-						// if (page.isActive) that.CalculationMoney();
-						this.getList();
-						return q
-					});
-				}
-			},
-
-			deleteCart(event) {
-				//删除购物车数据
-				// const index = event.currentTarget.dataset.index;
-				// const page = this.data.pageList[index];
-				const page = this.pageList;
-				let ids = [];
-				page.map(item => {
-					item.list.map(it => {
-						if (it.isActive) ids.push(it.id);
-					});
-				});
-				if (!ids || ids.length == 0) return req.msg('请选择删除项');
-				let that = this;
-				req.msgConfirm('确定删除该商品', () => {
-					req.postRequest('/api/purchase/deletes', {
-						ids: ids.join(',')
-					}, () => {
-						let data = [];
-
-						for (let i = 0, len = that.pageList.length; i < len; i++) {
-							data.push({
-								merchantId: that.pageList[i].merchantId,
-								merchantName: that.pageList[i].merchantName,
-								isTimely: that.pageList[i].isTimely,
-								list: that.pageList[i].list.filter(it => !it.isActive)
-							});
-						}
-
-						data = data.filter(res => res.list.length != 0);
-
-						if (data.length <= 0) {
-							that.setData({
-								ishow: true,
-								isAll: false
-							});
-						} else {
-							that.setData({
-								ishow: false
-							});
-						}
-
-						that.setData({
-							pageList: data,
-							count: 0,
-							money: 0.00
-						});
-						this.setData({
-							isUpdate: !this.isUpdate
-						}); // if (page.isActive) that.CalculationMoney();
-					});
-				});
-			},
-
-			CalculationMoney(index) {
-				//计算商品总价格
-				let arr = [];
-				let jsdMoney = 0;
-				let money = 0.00;
-				let integral = 0;
-				let merchantMoney = 0;
-				deliverWay = [];
-				this.pageList.forEach(el => {
-					if(el.list.filter(it => it.isActive).length < 1){
-						ativityType = [];
-					}
-					arr.push(el.list.filter(it => it.isActive).length);
-					el.list.filter(it => it.isActive).forEach(lst => {
-						jsdMoney += lst.quantity * lst.price;
-						integral += lst.quantity * lst.integral;
-						deliverWay.push(JSON.parse(lst
-							.deliverWay
-						)); // deliverWay=[...new Set(deliverWay.concat(JSON.parse(lst.deliverWay)))]
-					}); // console.log(deliverWay);
-				}); // console.log(deliverWay);
-
-				let res = this.pageList.map(el => {
-					el.merchantMoney = this.about.Min_Order_Money ? this.about.Min_Order_Money : 0;
-					if (commodity.length == 0) {
-						el.freeShipping = parseFloat(this.about.Free_Shipping - merchantMoney).toFixed(2);
-					}
-					el.list.filter(it => it.isActive).forEach(lst => {
-						if (merchantArr[0] == lst.merchantId) {
-							// console.log("4546456")
-							merchantMoney += lst.quantity * lst.price;
-							el.merchantMoney = parseFloat(this.about.Min_Order_Money - merchantMoney)
-								.toFixed(2);
-							el.freeShipping = parseFloat(this.about.Free_Shipping - merchantMoney).toFixed(
-								2);
-							return lst;
-						}
-					});
-					return el;
-				});
-
-				var count = arr.reduce(function(prev, cur) {
-					return prev + cur;
-				}, 0);
-				// console.log(res, "=============")
-				money = Number(jsdMoney);
-				this.setData({
-					count: count,
-					money: parseFloat(money).toFixed(2),
-					integral: integral,
-					pageList: res
-
-				});
-			},
-
-			Settlement() {
-				// debugger
-				const page = this.pageList;
-				const ids = [];
-				// console.log(page);
-				page.map(item => {
-					item.list.map(it => {
-						if (it.isActive) ids.push(it.id);
-					});
-				});
-				if (this.about.Min_Order_Money) {
-					if (this.about.Min_Order_Money - this.money > 0) {
-						// console.log('还差' + parseFloat(this.about.Min_Order_Money).toFixed(2) - parseFloat(this.money)
-							// .toFixed(2) + '元下单');
-						return req.msg('还差' + (parseFloat(this.about.Min_Order_Money).toFixed(2) - parseFloat(this.money)
-								.toFixed(2)) +
-							'元下单');
-					}
-				}
-				if (ids.length == 0) return req.msg('未选择结算商品');
-				const timely = [];
-				const noTimely = [];
-				const merchantList = [];
-				const timelyList = [];
-				const all = []
-				page.map(item => {
-					item.list.map(it => {
-						//发货方式：自提1,邮寄2,同城配送3,自主配送4;
-						if (it.isActive && it.deliverWay && JSON.parse(it.deliverWay).indexOf(3) != -1)
-							timely.push(it);
-						if ((it.isActive && it.deliverWay && JSON.parse(it.deliverWay).indexOf(3) == -1) ||
-							(it.deliverWay == null && it.isActive)) noTimely.push(it);
-						if (it.isActive) all.push(it);
-					});
-				}); // 常规产品
-
-				noTimely.forEach(el => {
-					if (merchantList.length == 0) {
-						merchantList.push({
-							merchantId: el.merchantId,
-							merchantName: el.merchantName,
-							isTimely: 0,
-							isActive: false,
-							list: [el],
-							shopId: el.shopId,
-							shopName: el.shopName
-						});
-					} else {
-						let res = merchantList.some(item => {
-							if (item.merchantId == el.merchantId && item.shopId == el.shopId) {
-								item.list.push(el);
-								return true;
-							}
-						});
-
-						if (!res) {
-							merchantList.push({
-								merchantId: el.merchantId,
-								isTimely: 0,
-								merchantName: el.merchantName,
-								isActive: false,
-								list: [el],
-								shopId: el.shopId,
-								shopName: el.shopName
-							});
-						}
-					}
-				});
-				// 及时达
-				timely.forEach(el => {
-					if (timelyList.length == 0) {
-						timelyList.push({
-							merchantId: el.merchantId,
-							merchantName: el.merchantName,
-							isTimely: 1,
-							isActive: false,
-							list: [el],
-							shopId: el.shopId,
-							shopName: el.shopName
-						});
-					} else {
-						let res = timelyList.some(item => {
-							if (item.merchantId == el.merchantId && item.shopId == el.shopId) {
-								item.list.push(el);
-								return true;
-							}
-						});
-
-						if (!res) {
-							timelyList.push({
-								merchantId: el.merchantId,
-								isTimely: 1,
-								merchantName: el.merchantName,
-								isActive: false,
-								list: [el],
-								shopId: el.shopId,
-								shopName: el.shopName
-							});
-						}
-					}
-				}); // const timely = this.data.pageList.filter(it => it.isActive && it.isTimely === 1);
-				// const noTimely = this.data.pageList.filter(it => it.isActive && it.isTimely === 0);
-
-				// console.log(timely, noTimely); // 海外购产品
-				let hwg = noTimely.filter(it => it.isOtc == 5);
-				let act = all.filter(it => it.activityType)
-				let otc = all.filter(it => !it.activityType)
-				let active = []
-				if (act.length > 0) {
-					all.forEach(it => {
-						if (it.activityType == act[0].activityType) {
-							active.push(it)
-						}
-
-					})
-				}
-				// if (timely.length > 0 && noTimely.length > 0) return req.alertMsg('及时达商品和非及时达商品不能一起下单');
-				// console.log("act", act, "otc", otc, "active", active, "all", all)
-				if (merchantList.length >= 2 || timelyList.length >= 2) return req.alertMsg('门店与门店之间不能一起下单'); //判断是否及时达订单
-
-				let redirect = 'product/subOrder/subOrder?ids=' + ids.join(',');
-				let orderType = 1;
-				let merchantId = '';
-				let shopId;
-				if (timely.length > 0) merchantId = timelyList[0].merchantId;
-				if (active.length > 0 && act.length > 0) {
-					if (active.length == all.length) {
-						if (act[0].activityType == 1) orderType = 2
-						if (act[0].activityType == 2) orderType = 3
-						if (act[0].activityType == 3) orderType = 4
-						if (act[0].activityType == 4) orderType = 6
-						if (act[0].activityType == 5) orderType = 7
-					} else {
-						orderType = 20
-					}
-				} else {
-					if (timely.length > 0) orderType = 5;
-					if (hwg.length > 0) orderType = 10;
-					if (act.length > 0 && otc.length > 0) orderType = 20
-					if (this.query.integralshop == 1) orderType = 11;
-				}
-				if (merchantList.length > 0) {
-					merchantId = merchantList[0].merchantId;
-
-					if (merchantList[0].shopId) {
-						shopId = merchantList[0].shopId;
-						redirect += '&shopId=' + shopId;
-					}
-				}
-				
-
-
-				redirect += '&orderType=' + orderType + '&merchantId=' + merchantId;
-				app.globalData.openPage(redirect);
-				// console.log(redirect)
-			},
-
-			edit() {
-				deliverWay = [];
-				merchantArr = [];
-				commodity = [];
-
-				if (this.isEdit) {
-					let res = this.pageList.map(it => {
-						it.merchantMoney = this.about.Min_Order_Money ? this.about.Min_Order_Money : 0;
-						it.freeShipping = this.about.Free_Shipping ? this.about.Free_Shipping : 0;
-						it.list.map(el => {
-							el.isActive = false;
-							return el;
-						});
-						it.isActive = false;
-						return it;
-					});
-					// console.log(res);
-					this.setData({
-						pageList: res,
-						isAll: false,
-						money: 0.00
-					});
-				}
-
-				if (!this.isEdit) {
-					// console.log(this.fou);
-					this.fou = false;
-				}
-				this.setData({
-					isEdit: !this.isEdit
-				});
-			},
-			goindex() {
-				uni.switchTab({
-					url: req.header.appId == 'ZQ1VK5oc17I387E' ? '/pages/timelyDelivery/index' :
-						'/pages/index/index'
-				})
-			},
-			getLikeList() {
-				//Recommend
-				if (!this.isLikeLoad) return false;
-				this.isLikeLoad = false;
-				let that = this;
-				req.getRequest('/api/product/list', {
-					page: that.page,
-					limit: 10,
-					attr: 'sell_well'
-				}, res => {
-					if (res && res.length >= 10) that.isLikeLoad = true;
-					if (that.page > 1) res = that.likeList.concat(res);
-					res = res.map(it => {
-						if (it.deliverWay && JSON.parse(it.deliverWay).indexOf(3) != -1) it.isJs = true;
-						return it;
-					});
-					that.setData({
-						likeList: res
-					});
-				});
-			}
-
-		}
-	};
-</script>
-<style>
-	@import "./cart.css";
-</style>

pages/fenlei/fenlei.css

@@ -1,10 +0,0 @@
-/* pages/fenlei/fenlei.wxss */
-.left{width: 22%;background: #F0F0F0;position: fixed;left: 0;top: 0;font-size: 26rpx;content: #333;}
-.left .li{line-height: 100rpx;text-align: center;}
-.left .li.active{font-weight: bold;background: #fff;border-left: 6rpx solid var(--mina) !important;}
-.right{width: 78%;position: absolute;right: 0;top: 0;box-sizing: border-box;}
-.rcon{padding: 0 20rpx 20rpx;}
-.tit{padding: 25rpx 0 15px;font-size: 24rpx;color: #9A9A9A;}
-.list{flex-wrap: wrap;background: #fff;border-radius: 10rpx;padding: 40rpx 15rpx 0;overflow: hidden;}
-.list .li{margin-bottom: 55rpx;width: 33.33%;text-align: center;font-size: 24rpx;color: #666;}
-.list image{display: block;width: 120rpx;height: 120rpx;margin: 0 auto 15rpx;}

pages/fenlei/fenlei.vue

@@ -1,215 +0,0 @@
-<template>
-<view>
-<!--pages/fenlei/fenlei.wxml-->
-<scroll-view scroll-y="true" class="left" :style="'bottom:' + (bottomBlankHeignt + 115) + 'rpx'">
-  <block v-for="(item, index) in categorys" :key="index">
-  <view :class="'li ' + (current == index ? 'active' : '')" :data-index="index" @tap="toScrollView" :data-id="item.id">{{item.title}}</view>
-  </block>
-</scroll-view>
-<scroll-view scroll-y="true" class="right" :style="'height:' + scrollHeight + 'px;'" :scroll-into-view="toView" scroll-top="0" @scroll="scrollTo" scroll-with-animation="true">
-  <view class="rcon">
-    <view v-for="(cats, idx) in categorys" :key="idx" :id="'position' + idx">
-      <view class="tit">{{cats.title}}</view>
-      <view class="list dflex">
-        <view v-for="(item, index) in cats.nodes" :key="index" class="li" @tap="goUrl" :data-url="'product/list/list?id=' + item.id + '&title=' + item.title">
-          <image :src="item.icon"></image>
-          {{item.title}}
-        </view>
-      </view>
-    </view>
-  </view>
-</scroll-view>
-
-
-<foot channel="sort"></foot>
-</view>
-</template>
-
-<script>
-// pages/fenlei/fenlei.js
-const app = getApp();
-const req = require("../../utils/request.js");
-let scrollDdirection = 0; // 用来计算滚动的方向
-import foot from "../../components/nav-bar/index";
-
-export default {
-  data() {
-    return {
-      bottomBlankHeignt: app.globalData.isIPhoneX ? 68 : 0,
-      categorys: [],
-      //产品一级分类列表
-      current: 0,
-      scrollTop: 0,
-      scrollHeight: 0,
-      // 滚动视图的高度
-      toView: 'position0',
-      // 滚动视图跳转的位置
-      scrollInfo: [],
-      isload: false,
-      _key: ""
-    };
-  },
-
-  components: {
-    foot
-  },
-  props: {},
-  onLoad: function (options) {
-    this.category();
-    uni.getSystemInfo({
-      success: res => {
-        this.setData({
-          scrollHeight: res.windowHeight - 136 * res.windowWidth / 750
-        });
-      }
-    });
-  },
-  methods: {
-    category() {
-      //产品分类
-      let that = this;
-      req.getRequest('/api/category/list', {
-        page: 1,
-        size: 1000
-      }, res => {
-        if (res) {
-          let array = [];
-          res.map(item => {
-            if (item.pid == 0) {
-              array.push(item);
-            }
-          });
-          /*右边数据*/
-
-          array.forEach(elm => {
-            var twoArray = [];
-            res.forEach(function (elm2, idx) {
-              if (elm2.pid == elm.id) {
-                twoArray.push(elm2);
-              }
-            });
-            elm.nodes = twoArray;
-          });
-          that.setData({
-            categorys: array
-          });
-          setTimeout(() => {
-            that.lisenerScroll();
-          }, 100);
-        }
-      });
-    },
-
-    goUrl(e) {
-      app.globalData.openPage(e.currentTarget.dataset.url);
-    },
-
-    toScrollView(e) {
-      const {
-        index
-      } = e.currentTarget.dataset;
-      this.setData({
-        current: index,
-        toView: `position${index}`
-      });
-    },
-
-    /**
-     * 获取右边每个分类的头部偏移量
-     */
-    lisenerScroll() {
-      // var _ts=this;
-
-      /* setTimeout(() => {
-         _ts.setHeight(0);
-       }, 10000);*/
-      // 获取各分类容器距离顶部的距离
-      new Promise(resolve => {
-        let query = uni.createSelectorQuery();
-        var clength = this.categorys.length;
-
-        for (var k = 0; k < clength; k++) {
-          query.select(`#position${k}`).boundingClientRect();
-        }
-
-        query.exec(function (res) {
-          resolve(res);
-        });
-      }).then(res => {
-        var categorys = this.categorys;
-
-        if (res.length == categorys.length) {
-          categorys.forEach((item, index) => {
-            item.offsetTop = res[index].top;
-          });
-          this.setData({
-            scrollInfo: res,
-            categorys: categorys
-          });
-        }
-      });
-    },
-
-    setHeight(k) {
-      var _ts = this;
-
-      if (_ts.isload) {
-        return;
-      }
-
-      _ts.isload = false;
-      let query = uni.createSelectorQuery();
-      query.select(`#position${k}`).boundingClientRect();
-      query.exec(function (res) {
-        // console.log(res);
-
-        var _key = "categorys[" + k + "].offsetTop";
-
-        _ts.setData({
-          [_key]: res[0].top
-        });
-
-        _ts.isload = true;
-      });
-    },
-
-    /**
-     * 监听滚动条滚动事件
-     */
-    scrollTo(e) {
-      const scrollTop = e.detail.scrollTop; //滚动的Y轴
-
-      const {
-        current,
-        categorys
-      } = this;
-
-      if (scrollDdirection < scrollTop) {
-        // 向上滑动
-        scrollDdirection = scrollTop; // 计算偏移位置
-        //  console.log(current, scrollTop,categorys[current + 1].offsetTop);
-
-        if (current < categorys.length - 1 && scrollTop >= categorys[current + 1].offsetTop) {
-          // console.log("chua");
-          this.setData({
-            current: current + 1
-          });
-        }
-      } else {
-        // 向下滑动
-        scrollDdirection = scrollTop; // 计算偏移位置
-
-        if (current > 0 && scrollTop < categorys[current].offsetTop && scrollTop > 0) {
-          this.setData({
-            current: current - 1
-          });
-        }
-      }
-    }
-
-  }
-};
-</script>
-<style>
-@import "./fenlei.css";
-</style>

pages/interactive/index.css

@@ -1,131 +0,0 @@
-/* index.css */
-page{background: #fff;}
-.top{background: #fff;position: fixed;left: 0;right: 0;top: 0;z-index: 50;padding: 20rpx 30rpx;height: 100rpx;box-sizing: border-box;}
-.top-tab .li{font-size: 28rpx;color: #999;margin-right: 40rpx;position: relative;line-height: 50rpx;height: 60rpx;}
-.top-tab .li.active{font-size: 36rpx;color: #000;font-weight: bold;}
-.top-tab .li.active::after{content: '';display: block;width: 30rpx;height: 7rpx;background: var(--mina);border-radius: 4rpx;position: absolute;left: 50%;transform: translateX(-50%);bottom: 0;}
-.search{width: 315rpx;height: 60rpx;background: #F7F7F7;border-radius: 30rpx;font-size: 24rpx;color: #B3B3B3;padding: 0 32rpx;box-sizing: border-box;}
-.search image{width: 30rpx;height: 30rpx;margin-right: 7rpx;}
-.t-con{padding: 20rpx 0 0 30rpx;overflow: hidden;background: #fff;}
-.item{vertical-align: top;background: #FFFFFF;box-shadow: 0 4rpx 24rpx 1rpx rgba(96,96,96,0.06);border-radius: 20rpx;box-sizing: border-box;position: relative;padding: 30rpx;margin-right: 30rpx;min-height: 300rpx;}
-.item::before{content: '';display: block;height: 137rpx;background: linear-gradient(180deg, #FFD6D8 0%, #FFFFFF 100%);position: absolute;top: 0;left: 0;right: 0;border-radius: 20rpx 20rpx 0 0;z-index: 1;}
-.t-con .item:nth-child(2)::before{background: linear-gradient(180deg, #FFE9DC 0%, #FFFFFF 100%);}
-.tits{justify-content: space-between;position: relative;z-index: 2;}
-.hot{width: 199rpx;height: 45rpx;}
-.more{width: 107rpx;height: 48rpx;background: #fff;border-radius: 24rpx;font-size: 24rpx;color: #666;justify-content: center;}
-.more image{width: 9rpx;height: 14rpx;margin-left: 8rpx;}
-.item-list{position: relative;z-index: 2;margin-top: 15rpx;overflow: hidden;}
-.item-list .li{font-size: 28rpx;color: #000;margin-top: 22rpx;}
-.item-list .li text{display: block;font-size: 24rpx;color: #B3B3B3;}
-.item-list .li text.num{color: #999;font-size: 28rpx;width: 44rpx;text-align: center;}
-.item-list .li:first-child text.num{color: #009AFF;}
-.item-list .li:nth-child(2) text.num{color: #006FFF;}
-.item-list .li:nth-child(3) text.num{color: #11C8B1;}
-.tab{padding: 45rpx 30rpx 20rpx;background: #fff;}
-.tab .li{min-width: 88rpx;height: 48rpx;background:#F7F7F7;border-radius: 24rpx;font-size: 24rpx;color: #000;text-align: center;line-height: 48rpx;margin-right: 30rpx;box-sizing: border-box;padding: 0 20rpx;}
-.tab .li.active{background: #FFEBEB;color: #EB1C24;}
-.loc-wz{margin: 0 30rpx;}
-.loc-wzs{height: 48rpx;border-radius: 24rpx;border: 1rpx solid #EBEBEB;font-size: 24rpx;color: #666;padding: 0 25rpx;position: relative;}
-.loc-wzs:before,.loc-wzs::after{content: '';display: block;width: 0;height: 0;border: 12rpx solid transparent;border-top: none;position: absolute;left: 35rpx;}
-.loc-wzs:before{border-bottom-color: #EBEBEB;top: -12rpx;z-index: 2;}
-.loc-wzs:after{border-bottom-color: #fff;top: -10rpx;z-index: 3;}
-.loc-wzs image{width: 26rpx;height: 31rpx;margin-right: 8rpx;}
-.cons-b{padding: 10rpx 0 30rpx;background: #fff;border-radius: 20rpx;}
-.cons-b-tp{padding-top: 0;border-radius: 0;}
-.list .li{padding: 40rpx 32rpx 45rpx;border-bottom: 1rpx solid rgba(174, 174, 174, 0.2);}
-.cons-b-tp .list .li:first-child{padding-top: 20rpx;}
-.list .li:last-child{border-bottom: none;}
-.userimg{width: 66rpx;height: 66rpx;border-radius: 50%;margin-right: 12rpx;}
-.name{font-size: 28rpx;color: #333;font-weight: bold;}
-.vip-tag{width: 41rpx;height: 31rpx;margin-left: 10rpx;}
-.time{font-size: 24rpx;color: #999;}
-.area{font-size: 24rpx;color: #999;margin-top: 8rpx;}
-.des{font-size: 30rpx;color: #000;line-height: 50rpx;margin: 30rpx 0 0;word-wrap: break-word;}
-.video{margin-top: 20rpx;position: relative;}
-.video video{width: 100%;height: 380rpx;border-radius: 15rpx;display: block;}
-.video-play{position: absolute;top: 0;left: 0;right: 0;bottom: 0;justify-content: center;background: rgba(0,0,0,.5);border-radius: 15rpx;}
-.video-play image{width: 82rpx;height: 82rpx;}
-.imgbox{flex-wrap: wrap;margin-top: 20rpx;}
-.imgbox image{width: 222rpx;height: 222rpx;border-radius: 16rpx;margin: 0 12rpx 12rpx 0;}
-.imgbox image:nth-child(3n){margin-right: 0;}
-.que{height: 78rpx;border-radius: 10rpx;background: linear-gradient(270deg, #FFFBEB 0%, #FFF3C9 100%);font-size: 28rpx;color: #FE7806;padding: 0 15rpx;margin-top: 20rpx;}
-.que .tovers{-webkit-line-clamp: 1;height: 78rpx;line-height: 78rpx;}
-.st-ico{width: 50rpx;height: 47rpx;margin-right: 15rpx;}
-.st-rico{width: 12rpx;height: 20rpx;margin-left: 35rpx;}
-.cates text{display: block;font-size: 20rpx;color: #999;background: #F7F7F7;height: 48rpx;border-radius: 24rpx;padding: 0 20rpx;margin: 30rpx 25rpx 0 0;line-height: 48rpx;}
-.topic{height: 40rpx;background: #FDF1F1;border-radius: 20rpx;font-size: 20rpx;color: #F32224;padding: 0 20rpx 0 10rpx;margin-top: 18rpx;margin-right: 10rpx;}
-.topic image{width: 28rpx;height: 28rpx;margin-right: 7rpx;}
-.loca{margin-top: 20rpx;font-size: 20rpx;color: #666;}
-.loca image{width: 26rpx;height: 31rpx;margin-right: 8rpx;}
-.loca text{margin-right: 10rpx;}
-.product{height: 168rpx;margin-top: 30rpx;overflow: hidden;}
-.pro-view{height: 168rpx;padding-bottom: 20rpx;white-space: nowrap;}
-.pro-view .lis{display: inline-block;width: 554rpx;height: 168rpx;background: #F7F8FA;border-radius: 16rpx;margin-right: 20rpx;padding: 16rpx;box-sizing: border-box;}
-.pro-view1 .lis{width: 688rpx;margin-right: 0;}
-.pro-view .lis .ddflex{align-items: flex-start;}
-.pic{width: 136rpx;height: 136rpx;border-radius: 16rpx;background: #fff;margin-right: 19rpx;}
-.title{font-size: 32rpx;color: #2F3237;/* white-space: initial;line-height: 37rpx;height: 74rpx; */}
-.opts{justify-content: space-between;margin-top: 40rpx;align-items: center !important;}
-.money{font-size: 36rpx;color: #FE0419;}
-.money text{font-size: 24rpx;}
-/* .pro-btn{width: 94rpx;height: 46rpx;background: #FF9C9F;border-radius: 23rpx;font-size: 28rpx;color: #fff;text-align: center;line-height: 46rpx;} */
-.pro-btn image{width: 33rpx;height: 32rpx;}
-.opt{font-size: 24rpx;color: #999;margin-top: 30rpx;justify-content: flex-end;}
-.opt image{width: 33rpx;height: 33rpx;margin-right: 8rpx;}
-.opt .ddflex{margin-left: 50rpx !important;}
-.opt-share{font-size: 24rpx;color: #999;}
-.vote-box{margin-top: 50rpx;}
-.vote-box.ends{background: #f8f8f8;margin-top: 30rpx;padding: 20rpx;}
-.vote-tit{font-size: 28rpx;color: #000;}
-.vote-list .lis{height: 74rpx;background: #F9FAFC;border: 1rpx solid #EBEBEB;border-radius: 8rpx;font-size: 30rpx;color: #EB1C24;text-align: center;line-height: 74rpx;margin-top: 20rpx;padding: 0 28rpx;position: relative;overflow: hidden;}
-.end .lis{text-align: left;color: #9B9B9B;}
-.end .lis view{position: relative;z-index: 2;}
-.end .lis view.percent{position: absolute;top: 0;bottom: 0;left: 0;background: #F0F0F0;z-index: 0;}
-.end .lis.active{color: #EB1C24;}
-.end .lis.active view.percent{background: #FFEBEB;}
-.vote-can{font-size: 22rpx;color: #999;margin-top: 15rpx;}
-.vote-can text{margin-right: 15rpx;}
-.link{height: 150rpx;background: #F8F8F8;border-radius: 16rpx;padding: 24rpx;font-size: 28rpx;color: #333;box-sizing: border-box;margin-top: 30rpx;}
-.link image{width: 102rpx;height: 102rpx;margin-right: 12rpx;}
-.create{position: fixed;right: 30rpx;bottom: 15%;width: 110rpx;height: 110rpx;background: var(--mina);box-shadow: 0 4rpx 24rpx rgba(153,153,153,0.4000);border-radius: 50%;font-size: 24rpx;color: #fff;text-align: center;z-index: 50;box-sizing: border-box;padding-top: 20rpx;}
-.create image{width: 41rpx;height: 41rpx;margin: 0 auto;}
-.ceng{position: fixed;top: 0;left: 0;right: 0;bottom: 0;background: rgba(0,0,0,.5);z-index: 60;}
-.side{position: fixed;right: 165rpx;bottom: 16%;z-index: 61;width: 300rpx;height: 183rpx;background: #FFFFFF;border-radius: 20rpx;font-size: 30rpx;color: #000;align-items: flex-start;padding-left: 20rpx;}
-.side::after{content: '';display: block;width: 0;height: 0;border: 10rpx solid rgba(255,255,255,0);border-right: none;border-left-color: #fff;position: absolute;bottom: 30rpx;right: -10rpx;}
-.side .li{width: 50%;text-align: center;}
-.side .li image{width: 38rpx;height: 38rpx;margin: 49rpx auto 15rpx;}
-.dong-t{background: #fff;padding: 32rpx 30rpx;}
-.bang{border-radius: 20rpx;background: linear-gradient(180deg, #FFE4CC 5%, #FFFFFF 40%);padding: 30rpx 25rpx 35rpx;box-shadow: 0 4rpx 24rpx rgba(96, 96, 96, 0.06);}
-.bang-img{width: 307rpx;height: 42rpx;}
-.tiwen{padding: 0 60rpx 0 52rpx;font-size: 28rpx;color: #565A5B;margin: 10rpx 0 40rpx;}
-.twbtn{width: 164rpx;height: 62rpx;background: #FFA557;border-radius: 31rpx;font-size: 28rpx;color: #fff;justify-content: center;}
-.twbtn image{width: 11rpx;height: 18rpx;margin-left: 8rpx;}
-.bang-wen{background: #FAFAFA;border-radius: 8rpx;font-size: 28rpx;color: #000;line-height: 40rpx;align-items: flex-start;padding: 23rpx;}
-.bang-wen image{width: 36rpx;height: 36rpx;margin-right: 15rpx;}
-.wen{display: inline-block;width: 60rpx;height: 34rpx;background: #3DB4FF;border-radius: 4rpx;font-size: 24rpx;color: #fff;text-align: center;line-height: 34rpx;margin-right: 15rpx;}
-.edit{position: fixed;right: 30rpx;bottom: 170rpx;width: 110rpx;height: 110rpx;background: var(--main);box-shadow: 0px 4px 24px rgba(255, 156, 159, 0.3);border-radius: 50%;text-align: center;z-index: 50;}
-.edit image{width: 100%;height: 100%;}
-
-/* 团队 */
-.m-team{background: #FFF6F6;margin: 20rpx 30rpx 0;border-radius: 20rpx;padding-bottom: 30rpx;}
-.m-tits{font-size: 28rpx;color: #EB1C24;font-weight: bold;padding: 25rpx 30rpx;}
-.m-nums{font-size: 24rpx;color: #999;font-weight: normal;}
-.m-nums image{width: 16rpx;height: 27rpx;margin-left: 15rpx;}
-.map-team{height: 122rpx;overflow: hidden;}
-.map-teams{white-space: nowrap;height: 142rpx;}
-.map-teams .li{display: inline-block;background: #fff;width: 412rpx;height: 122rpx;border-radius: 15rpx;padding: 0 20rpx;font-size: 32rpx;color: #333;box-sizing: border-box;margin-right: 20rpx;}
-.map-teams .li:first-child{margin-left: 30rpx;}
-.map-teams .li:last-child{margin-right: 30rpx;}
-.map-teams .li .ddflex{height: 100%;}
-.map-teams .li image{width: 76rpx;height: 76rpx;border-radius: 15rpx;margin-right: 20rpx;}
-.map-teams .li text{display: block;font-size: 24rpx;color: #999;margin-top: 5rpx;}
-.li-btn{width: 107rpx;height: 45rpx;border-radius: 37rpx;border: 2rpx solid rgba(235, 28, 36, .5);font-size: 24rpx;color: #EB1C24;text-align: center;line-height: 45rpx;margin-left: 10rpx;}
-.sta{font-size: 24rpx;color: #e6a23c;}
-.fail{color: #f56c6c;}
-.team-list{padding: 0 30rpx 50rpx;}
-.team-list .li{margin-top: 50rpx;}
-.team-img{width: 76rpx;height: 76rpx;border-radius: 15rpx;margin-right: 20rpx;}
-.team-tit{font-size: 32rpx;color: #333;}
-.team-sta{margin-top: 8rpx;font-size: 24rpx;color: #999;}
-.team-sta text{margin-right: 20rpx;}
-.join-btn{width: 133rpx;height: 60rpx;border-radius: 37rpx;border: 2rpx solid rgba(235, 28, 36, .5);font-size: 28rpx;color: #EB1C24;text-align: center;line-height: 60rpx;margin-left: 20rpx;}

pages/interactive/index.vue

@@ -1,747 +0,0 @@
-<template>
-	<view>
-		<view class="top ddflex">
-			<view class="top-tab ddflex fflex">
-				<view :class="'li ' + (currentTab == 1 ? 'active' : '')" @click="swiTab(1)">话题</view>
-				<view :class="'li ' + (currentTab == 2 ? 'active' : '')" @click="swiTab(2)">投票</view>
-				<view :class="'li ' + (currentTab == 3 ? 'active' : '')" @click="swiTab(3)">小组</view>
-			</view>
-			<view class="search ddflex" @click="jumpUrl('/office/search/index?currentTab='+currentTab)">
-				<image src="../../static/images/ssico.png"></image>
-				搜索你感兴趣的
-			</view>
-		</view>
-		<view style="height: 100rpx;"></view>
-		<block v-if="currentTab == 1 || currentTab == 2">
-		<block v-if="currentTab == 1">
-		<view class="t-con">
-			<view class="item">
-				<navigator url="/topics/index/index" hover-class="none" class="tits ddflex">
-					<image :src="picUrlss+'office_images/hot.png'" class="hot"></image>
-					<view class="more ddflex">更多<image src="../../static/images/n_rico.png"></image></view>
-				</navigator>
-				<view class="item-list">
-					<view class="li ddflex" v-for="(item, index) in hotTopicList" :key="index" @click="jumpUrl('/topics/detail/detail?topicId=' + item.id)">
-						<text class="num">{{ index + 1 }}</text>
-						<view class="fflex tover">{{ item.title }}</view>
-						<text>{{ item.participantsNO }}参与</text>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="tab ddflex">
-			<view :class="'li ' + (pType == 11 ? 'active' : '')" @click="swiPType(11)">附近</view>
-			<!-- <view :class="'li ' + (pType == 1 ? 'active' : '')" @click="swiPType(1)">综合</view> -->
-			<!-- <view :class="'li ' + (cateIndex == index ? 'active' : '')" @click="swiTree(item,index)" v-for="(item,index) in category" :key="index">{{item.name}}</view> -->
-			<view :class="'li ' + (pType == 12 ? 'active' : '')" @click="swiPType(12)">最新</view>
-			<!-- <view :class="'li ' + (pType == 5 ? 'active' : '')" @click="swiPType(5)">热门</view> -->
-		</view>
-		<view class="loc-wz ddflex" v-if="pois&&pois.poiName&&pType==11" @click="jumpUrlPoi(pois,'/office/poi/index')">
-			<view class="loc-wzs ddflex">
-				<image :src="picUrlss+'office_images/loca.png'"></image>{{pois.poiName}}
-			</view>
-		</view>
-		</block>
-		<view :class="'cons-b'+(currentTab==2?' cons-b-tp':'')">
-			<view class="list" v-if="officeList && officeList.length > 0">
-				<view class="li" v-for="(item, index) in officeList" :key="index">
-					<view class="user ddflex" @click="jumpUrl('/topics/home/home?userId=' + item.userDTO.id)">
-						<image :src="item.userDTO.avatar" mode="aspectFill" class="userimg"></image>
-						<view class="fflex">
-							<view class="namea ddflex">
-								<view class="name fflex ddflex">{{ item.userDTO.nickName }}<image src="../../static/images/vip_tag.png" class="vip-tag" v-if="item.userDTO.levelGrade > 0"></image></view>
-								<view class="time">{{ item.time }}</view>
-							</view>
-							<view class="area" v-if="item.userDTO.cityName">{{ item.userDTO.provinceName }} {{ item.userDTO.cityName }}</view>
-						</view>
-					</view>
-					<view class="des" @click="jumpUrlDetail(item)"><rich-text :nodes="item.content"></rich-text></view>
-					<!-- //如果有投票，就不显示图片 -->
-					<block v-if="!item.qyPoll">
-					<view class="video" v-if="item.isHaveVideo && config.open_community_video == 1">
-						<video :src="item.url" :show-center-play-btn="false" :controls="item.isControls" :autoplay="item.isControls" :id="'myVideo'+index" @pause="videoPause(index)" @ended="videoEnded(index)"></video>
-						<view class="video-play ddflex" @click="videoPlay(index)" v-if="item.isShowPlayBtn"><image src="../../static/images/play.png"></image></view>
-					</view>
-					<view class="imgbox ddflex" @click="jumpUrlDetail(item)" v-if="!item.isHaveVideo"><!-- @click="previewImgss(item.url, idx)" -->
-						<block v-if="item.url&&item.url.length>0">
-							<image mode="aspectFill" v-for="(it, idx) in item.url" :src="it" :key="idx"></image>
-						</block>
-					</view>
-					</block>
-					<!-- 话题 -->
-					<view class="ddflex" v-if="item.qyDialogu">
-						<view class="topic ddflex" @click="jumpUrl('/topics/detail/detail?topicId=' + item.qyDialogu.id)">
-							<image src="../../static/images/topic.png"></image>
-							{{ item.qyDialogu.title }}
-						</view>
-						<!-- <view class="topic ddflex" @click="jumpUrl('/topics/detail/detail?topicId=' + item.qyDialogu.id)">
-							<image src="../../static/images/topic.png"></image>
-							{{ item.qyDialogu.title }}
-						</view> -->
-					</view>
-					<view class="loca ddflex" @click="jumpUrlPoi(item,'/office/poi/index')" v-if="item.poiName"><image :src="picUrlss+'office_images/loca.png'"></image><text v-if="item.poiDistance > 0">{{item.poiDistance ? item.poiDistance < 1000 ? item.poiDistance+'m' : (item.poiDistance/1000).toFixed(1)+'km' : ''}}</text>{{item.poiName}}</view>
-					<!-- 投票 -->
-					<view :class="'vote-box' + (item.qyPoll.isEnd ? ' ends' : '')" v-if="item.qyPoll">
-						<view class="vote-tit">{{ item.qyPoll.title }}</view>
-						<block v-if="item.qyPoll.isVote == 1">
-							<view class="vote-list end" @click="jumpUrlDetail(item)">
-								<view :class="'lis ddflex  ' + (itpy.isVote == 1 ? 'active' : '')" v-for="(itpy, idex) in JSON.parse(item.qyPoll.optionJson)" :key="idex">
-									<view class="percent" :style="'width:' + parseFloat(itpy.proportion) + '%;'"></view>
-									<view class="fflex">{{ itpy.name }}</view>
-									<view>{{ parseFloat(itpy.proportion) + '%' }}</view>
-								</view>
-							</view>
-						</block>
-						<block v-else>
-							<view class="vote-list">
-								<view class="lis" v-for="(itpy, idex) in JSON.parse(item.qyPoll.optionJson)" :key="idex" @click="submitPoll(item, index, idex)">
-									{{ itpy.name }}
-								</view>
-							</view>
-						</block>
-						<view class="vote-can" v-if="item.qyPoll.isEnd"><text>{{item.qyPoll.voteCount}}人参与</text>投票已结束</view>
-					</view>
-					<view class="product" v-if="item.products && item.products.length > 0">
-						<view scroll-x="true" class="pro-view pro-view1" v-if="item.products.length == 1">
-							<view class="lis" v-for="(it, idx) in item.products" :key="idx" @click="toProductDetail(it)">
-								<view class="ddflex">
-									<image :src="it.pic + '?x-oss-process=style/w375'" mode="aspectFill" class="pic"></image>
-									<view class="fflex">
-										<view class="title tover">{{ it.title }}</view>
-										<view class="opts ddflex">
-											<view class="money"><text>￥</text>{{ it.salePrice }}</view>
-											<view class="pro-btn"><image src="../../static/pages/images/n_cart.png"></image></view>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-						<scroll-view scroll-x="true" class="pro-view" v-else>
-							<view class="lis" v-for="(it, idx) in item.products" :key="idx" @click="toProductDetail(it)">
-								<view class="ddflex">
-									<image :src="it.pic + '?x-oss-process=style/w375'" mode="aspectFill" class="pic"></image>
-									<view class="fflex">
-										<view class="title tover">{{ it.title }}</view>
-										<view class="opts ddflex">
-											<view class="money"><text>￥</text>{{ it.salePrice }}</view>
-											<view class="pro-btn"><image src="../../static/pages/images/n_cart.png"></image></view>
-										</view>
-									</view>
-								</view>
-							</view>
-						</scroll-view>
-					</view>
-					<view class="opt ddflex" v-if="!item.source">
-						<view class="fflex" @click="jumpUrlDetail(item)">{{fomatNumbers(item.count.browseCount)}}次浏览</view>
-						<view class="ddflex" @click="submitFabulous(2, item.id, index)">
-							<image :src="'../../static/images/' + (item.isPraise == 1 ? 'like_h' : 'like') + '.png'"></image>
-							{{fomatNumbers(item.count.fabulousCount)}}
-						</view>
-						<view class="ddflex" @click="jumpUrlDetail(item)" v-if="config.is_show_create_btn == 1">
-							<image src="../../static/images/comment.png"></image>
-							{{fomatNumbers(item.count.commentCount)}}
-						</view>
-						<button open-type="share" hover-class="none" class="opt-share ddflex">
-							<image src="../../static/images/share.png"></image>
-							分享
-						</button>
-					</view>
-				</view>
-			</view>
-			<view class="nodata" v-else>
-				<image :src="picUrlss + 'empty_jl.png'"></image>
-				<text>暂无动态</text>
-			</view>
-		</view>
-		</block>
-		<block v-if="currentTab == 3">
-		<view class="m-team" v-if="userTeamList.length>0">
-			<view class="m-tits ddflex" @click="jumpUrl('/office/myTeam/index')">
-				<view class="fflex">我的团队</view>
-				<view class="m-nums ddflex">{{userTeamTotal}}个团队<image src="../../static/pages/images/more.png"></image></view>
-			</view>
-			<view class="map-team">
-				<scroll-view scroll-x="true" class="map-teams">
-					<view class="li" v-for="(item,index) in userTeamList" :key="index" @click="jumpUrlTeam(item,'/office/team/index?id='+item.id)">
-						<view class="ddflex">
-							<image :src="item.url?item.url:picUrlss+'office_images/team_default.png'" mode="aspectFill"></image>
-							<view class="fflex">
-								<view class="tover">{{item.title}}</view>
-								<text>日新贴{{item.dayMomentsNum}}</text>
-							</view>
-							<view class="li-btn" v-if="item.auditStatus == 1">去看看</view>
-							<view :class="'sta'+(item.auditStatus == 2 ? ' fail':'')" v-else>{{item.auditStatus == 0 ? '审核中' : '审核失败'}}</view>
-						</view>
-					</view>
-				</scroll-view>
-			</view>
-		</view>
-		<view class="team-list" v-if="teamList.length>0">
-			<view class="li ddflex" v-for="(item,index) in teamList" :key="index" @click="jumpUrl('/office/team/index?id='+item.id)">
-				<image :src="item.url?item.url:picUrlss+'office_images/team_default.png'" mode="aspectFill" class="team-img"></image>
-				<view class="fflex">
-					<view class="team-tit tover">{{item.title}}</view>
-					<view class="team-sta">
-						<text>{{item.memberNum}}成员</text>
-						<text>{{item.momentsNum}}帖子</text>
-					</view>
-				</view>
-				<view class="join-btn" @click.stop="joinTeam(item,index)">加入</view>
-			</view>
-		</view>
-		<view class="nodata" v-else>
-			<image :src="picUrlss + 'empty_jl.png'"></image>
-			<text>暂无团队</text>
-		</view>
-		</block>
-		<view class="create" @click="showBtn" v-if="config.is_show_create_btn == 1"><image src="../../static/images/create.png"></image>发布</view>
-		<view class="ceng" v-if="isShowbtn" @click="hideBtn"></view><!-- @click="createJump('/office/news/news?newsType=1')" -->
-		<view class="side ddflex" v-if="isShowbtn">
-			<view class="li" @click="createJump('/office/createTeam/index')">
-				<image src="../../static/images/ll_dt.png"></image>
-				<view>创建团队</view>
-			</view>
-			<view class="li" @click="createJump('/office/news/news?newsType=1')">
-				<image src="../../static/images/ll_cz.png"></image>
-				<view>发帖</view>
-			</view>
-		</view>
-		<foot channel="interactive" :isUpdate="false"></foot>
-	</view>
-</template>
-
-<script>
-	const app = getApp();
-	const api = require('../../utils/api.js');
-	const req = require('../../utils/request.js');
-	const util = require('../../utils/util.js');
-	const QQMapWX = require("../../utils/qqmap.js");
-	import foot from "../../components/nav-bar/index.vue"
-	export default {
-		components: {
-			foot
-		},
-		data() {
-			return {
-				systems: {},
-				currentTab: 1,
-				isShowbtn: false,
-				isShowPage: false,
-				picUrlss: req.public.picUrls,
-				isLoad: true,
-				form: {
-					page: 1,
-					limit: 5
-				},
-				pType: 11, //排序： 1综合, 2最新+综合,3浏览最多,4评论最多,5热门,10最新+标签，11位置，12时间
-				isHoleLoad: true,
-				holeForm: {
-					page: 1,
-					limit: 10
-				},
-				holeType: 1, //排序： 1综合, 2最新,3浏览最多,4评论最多,5热门
-				hotTopicList: [],
-				hotPollList: [],
-				officeList: [], //聊一聊
-				config: {},
-				videoCurrent: null,
-				videoContext: '',
-				category: [],
-				cateIndex: -1,
-				treeId: '',
-				pois: {},
-				currentPoi: {},
-				teamForm: {
-					page: 1,
-					limit: 10
-				},
-				isTeamLoad: true,
-				teamList: [],
-				userTeamList: [],
-				userTeamTotal: 0,
-				isFirst: true,
-				isRefresh: false
-			}
-		},
-		onLoad(options) {
-			uni.hideTabBar();
-			if(req.getStorage('officeList')){
-				this.officeList = JSON.parse(req.getStorage('officeList'));
-				this.isShowPage = true;
-			}
-			if(req.getStorage('loctionAddressMap')){
-				let pois = req.getStorage('loctionAddressMap').pois[0];
-				pois.poiName = pois.title;
-				pois.poiAddress = pois.address;
-				pois.poiLongitude = pois.location.lng;
-				pois.poiLatitude = pois.location.lat
-				this.pois = pois;
-				this.getOfficeList();
-				console.log('this.pois==',this.pois)
-			}else{
-				QQMapWX.initMap();
-				req.getLocation(res => {
-					const to = {
-						latitude: res.latitude,
-						longitude: res.longitude
-					};
-					QQMapWX.reverseGeocoder(to, resp => {
-						if(resp){
-							resp.pois.map(it=>{
-								it.poiName = it.title;
-								it.poiAddress = it.address;
-								it.poiLongitude = it.location.lng;
-								it.poiLatitude = it.location.lat
-								return it;
-							})
-							this.pois = resp.pois[0];
-						}
-						this.getOfficeList();
-					});
-				});
-			}
-			req.silenceLogin(options.userId, '');
-			// this.getHotPoll()
-		},
-		onShow() {
-			// this.getCategory();
-			this.getConfig();
-			this.getHotTopic();
-			if(this.currentTab > 2){
-				if(this.isRefresh){
-					this.teamForm.page = 1;
-					this.isTeamLoad = true;
-					this.getTeamPage();
-					this.getUserTeam();
-					this.isRefresh = false;
-				}
-			}else{
-				if(!this.isFirst && this.isRefresh){
-					this.form.page = 1;
-					this.isLoad = true;
-					this.getOfficeList();
-					this.isRefresh = false;
-				}
-			}
-		},
-		onHide() {
-			this.isShowbtn = false;
-		},
-		onReachBottom() {
-			if(this.currentTab > 1){
-				this.teamForm.page++;
-				this.getTeamPage();
-			}else{
-				this.form.page++;
-				this.getOfficeList();
-			}
-		},
-		methods: {
-			swiTab(index){
-				if(this.currentTab == index) return false;
-				this.currentTab = index;
-				if(index == 1){
-					this.pType = 11;
-				}else{
-					this.pType = 1;
-				}
-				this.teamList = [];
-				this.officeList = [];
-				if(index > 2){
-					this.isTeamLoad = true;
-					this.teamForm.page = 1;
-					this.getTeamPage();
-					this.getUserTeam();
-				}else{
-					this.isLoad = true;
-					this.form.page = 1;
-					this.getOfficeList();
-				}
-			},
-			//聊一聊切换排序类型
-			swiPType(type) {
-				this.isLoad = true;
-				this.form.page = 1;
-				this.pType = type;
-				this.cateIndex = -1
-				this.treeId = ''
-				this.getOfficeList();
-			},
-			//预览图片
-			previewImgss(picUrls, index) {
-				//预览合同图片
-				var src = picUrls[index];
-				let imgs = picUrls;
-				uni.previewImage({
-					current: src, // 当前显示图片的http链接
-					urls: imgs
-				});
-			},
-	
-			showBtn() {
-				if (!req.isLogins(true)) {
-					return;
-				}
-				this.isShowbtn = true;
-			},
-			hideBtn() {
-				this.isShowbtn = false;
-			},
-	
-			removeHtml(content) {
-				return util.removeHtml(content);
-			},
-			createJump(url) {
-				if (!req.isLogins(true)) {
-					return;
-				}
-				this.jumpUrl(url);
-			},
-			jumpUrl(url){
-				uni.navigateTo({
-					url: url
-				})
-			},
-			jumpUrlPoi(item,url){
-				console.log('item==',item)
-				this.currentPoi = item;
-				uni.navigateTo({
-					url: url
-				})
-			},
-			jumpUrlTeam(item,url){
-				if(item.auditStatus == 1) {
-					this.jumpUrl(url)
-				}else{
-					if(item.userId == req.getStorage('userInfo').id){
-						this.jumpUrl('/office/createTeam/index?id='+item.id);
-					}else{
-						if(item.auditStatus == 0){
-							req.msg('团队正在审核中，暂时无法查看')
-						}else{
-							req.msg('团队审核不通过，无法查看')
-						}
-					}
-				}
-			},
-			jumpToPractice(item,url){
-				let checkCategory = {
-					id: item.question.cateId,
-					name: item.question.cateName
-				}
-				req.setStorage('checkCategory',checkCategory)
-				this.jumpUrl(url);
-			},
-			jumpUrlDetail(item) {
-				this.jumpUrl('/office/detail/detail?contentId=' + item.id);
-			},
-			toProductDetail(item) {
-				this.jumpUrl('/product/detail/detail?id=' + item.id);
-			},
-			getHotTopic() {
-				var dataPram = {
-					page: 1,
-					limit: 4,
-					attr: 2
-				};
-				req.getRequest('/api/v3/dialogue/list', dataPram, data => {
-					this.hotTopicList = data;
-				});
-			},
-	
-			getHotPoll() {
-				var dataPram = {
-					page: 1,
-					limit: 4,
-					attr: 2,
-					attrType: 0
-				};
-				req.getRequest('/api/v3/poll/pollList', dataPram, data => {
-					this.hotPollList = data;
-				});
-			},
-			getCategory(){
-				req.getRequest('/api/v3/unified/tree/list',{type: 1},data=>{
-					this.category = data;
-				})
-			},
-			getConfig(){
-				req.getRequest('/api/config',{},data=>{
-					this.config = data;
-				})
-			},
-			swiTree(item,index){
-				if(this.cateIndex == index) return false;
-				this.cateIndex = index;
-				this.pType = -1;
-				this.treeId = item.id;
-				this.form.page = 1;
-				this.isLoad = true;
-				this.getOfficeList()
-			},
-			sum(arr) {
-				var s = 0;
-				for (var i=arr.length-1; i>=0; i--) {
-					if(arr[i].count){
-						s += Number(arr[i].count);
-					}
-				}
-				return s;
-			},
-			fomatNumbers(num){
-				return util.formatNumbers(num)
-			},
-			getOfficeList() {
-				let that = this;
-				var pramData = {};
-				pramData.page = this.form.page;
-				pramData.limit = this.form.limit;
-				// pramData.type = 4;
-				if (this.pType == 5) {
-					//热门
-					pramData.isEssence = 2;
-				} else {
-					pramData.orderType = this.pType;
-				}
-				if(this.treeId) {
-					pramData.treeId = this.treeId
-					pramData.orderType = 1
-				}else delete pramData.treeId
-				if(this.currentTab < 3) pramData.searchType = this.currentTab;//1话题 2投票 3团队
-				else delete pramData.searchType;
-				pramData.poiLongitude = req.getStorage('loctionAddressMap').location.lng ? req.getStorage('loctionAddressMap').location.lng : this.pois.poiLongitude;
-				pramData.poiLatitude = req.getStorage('loctionAddressMap').location.lat ? req.getStorage('loctionAddressMap').location.lat : this.pois.poiLatitude;
-				if(this.pType == 11) pramData.distance = 20000;
-				else delete pramData.distance;
-				if (!this.isLoad) return false; 
-				this.isLoad = false;
-				if(pramData.page == 1){
-					uni.showLoading({
-						mask: true
-					})
-				}
-				req.getRequest('/api/v3/moments/page', pramData, data => {
-					if(data.list&&data.list.length > 0){
-						data.list.map(it=>{
-							if(it.qyPoll && it.qyPoll.isEnd){
-								it.qyPoll.voteCount = that.sum(JSON.parse(it.qyPoll.optionJson))
-							}
-							if(it.url){
-								let h = it.url.substring(it.url.lastIndexOf('.') + 1)
-								if(h.indexOf('mp4')<0&&h.indexOf('MP4')<0){
-									it.url = it.url.split(',');
-								}else{
-									it.isHaveVideo = true
-									it.isControls = false
-									it.isShowPlayBtn = true
-								}
-							}
-							it.content = '<div style="overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 5;-webkit-box-orient: vertical;word-break: break-all;">' + it.content + '</div>'
-							return it;
-						})
-					}
-					if (data.list && data.list.length >= 10) {
-						this.isLoad = true;
-					}
-					if (this.form.page > 1) {
-						data.list = this.officeList.concat(data.list);
-					} else {
-						this.officeList = [];
-					}
-					this.officeList = data.list;
-					// if(this.form.page == 1){
-					// 	req.setStorage('officeList',JSON.stringify(this.officeList));
-					// }
-					this.isShowPage = true;
-					this.isFirst = false;
-					uni.hideLoading();
-				});
-			},
-			getTeamPage(){
-				if (!this.isTeamLoad) return false;
-				this.isTeamLoad = false;
-				let form = this.teamForm
-				if(form.page == 1){
-					uni.showLoading({
-						mask: true
-					})
-				}
-				req.getRequest(api.user_team_page,form,data=>{
-					if (data.list && data.list.length >= 10) this.isTeamLoad = true;
-					if (this.teamForm.page > 1) data.list = this.teamList.concat(data.list);
-					this.teamList = data.list;
-					uni.hideLoading();
-				})
-			},
-			getUserTeam(){
-				let form = {
-					page: 1,
-					limit: 5
-				}
-				req.getRequest(api.user_team_list,form,data=>{
-					this.userTeamList = data.list;
-					this.userTeamTotal = data.total;
-				})
-			},
-			//提交点赞、取消点赞；收藏、取消收藏
-			submitFabulous(type, id, index) {
-				if (!req.isLogins(true)) {
-					return;
-				}
-				var dataP = {};
-				dataP.type = type; //1，观看 ，2点赞，3评论，4分享，5收藏
-				dataP.momentsId = id;
-				req.postRequestLoding('/api/v3/fabulous/save', dataP, data => {
-					if (type == 2) {
-						//动态点赞
-						if (this.officeList[index].isPraise == 1) {
-							//已赞
-							this.officeList[index].isPraise = 0;
-							this.officeList[index].count.fabulousCount--;
-						} else {
-							this.officeList[index].isPraise = 1;
-							this.officeList[index].count.fabulousCount++;
-						}
-					}
-				});
-			},
-	
-			//提交投票
-			submitPoll(item, pIndex, pollIndex) {
-				if(item.qyPoll.isEnd){
-					this.jumpUrlDetail(item)
-					return false;
-				} 
-				var dataP = {};
-				// dataP.id = item.id;
-				dataP.pollId = item.qyPoll.id;
-				var pollObjList = JSON.parse(item.qyPoll.optionJson);
-				dataP.pollOptionCode = pollObjList[pollIndex].code;
-				req.postRequest('/api/v3/poll/saveDetails', dataP, data => {
-					req.msg('投票成功');
-					//图片完之后要将该投票的对象返回，便于做渲染%
-					this.officeList[pIndex].qyPoll = data;
-				});
-			},
-			goTop: function(e) {
-				// 一键回到顶部
-				if (uni.pageScrollTo) {
-					uni.pageScrollTo({
-						scrollTop: 0
-					});
-				} else {
-					uni.showModal({
-						title: '提示',
-						content: '当前微信版本过低，无法使用该功能，请升级到最新微信版本后重试。'
-					});
-				}
-			},
-			videoPlay(index){
-			    var that = this;
-			    var curIdx = index;
-			    this.officeList[index].isControls = true
-			    this.officeList[index].isShowPlayBtn = false
-			    // 有播放时先将prev暂停，再播放当前点击的current
-			    if (that.videoCurrent != null) {
-					var videoContextPrev = uni.createVideoContext('myVideo' + that.videoCurrent)
-					if (that.videoCurrent != curIdx) {
-						this.officeList[that.videoCurrent].isControls = false
-						this.officeList[that.videoCurrent].isShowPlayBtn = true
-						
-						videoContextPrev.stop()
-					}
-					that.videoCurrent = curIdx
-					var videoContextCurrent = uni.createVideoContext('myVideo' + curIdx)
-					videoContextCurrent.play()
-			    } else {  
-					// 没有播放时播放视频
-					that.videoCurrent = curIdx
-					var videoContext = uni.createVideoContext('myVideo' + curIdx) // 对应的视频id
-					videoContext.play()
-			    }
-			},
-			videoPause(index){
-				this.officeList[index].isControls = false
-				this.officeList[index].isShowPlayBtn = true
-			},
-			videoEnded(index){
-				this.officeList[index].isControls = false
-				this.officeList[index].isShowPlayBtn = true
-			},
-			joinTeam(item,index){
-				if(item.isJoin == 1) {
-					uni.navigateTo({
-						url: '/office/team/index?id='+item.id
-					})
-					return false;
-				}
-				req.postRequest(api.user_team_follow,{userGroupId: item.id},data=>{
-					req.msg('加入团队成功');
-					this.teamList.splice(index,1)
-					this.getUserTeam();
-				})
-			}
-		},
-		created() {
-			const systemInfo = uni.getSystemInfoSync();
-			// px转换到rpx的比例
-			let pxToRpxScale = 750 / systemInfo.windowWidth;
-			let systems = {
-				ktxStatusHeight: systemInfo.statusBarHeight * pxToRpxScale, // 状态栏的高度
-				navigationHeight: 44 * pxToRpxScale // 导航栏的高度
-			};
-			systems.barHeight = systems.ktxStatusHeight + systems.navigationHeight;
-			this.systems = systems;
-		},
-		onShareAppMessage: function() {
-			let path = '/pages/interactive/index?isShare=' + true;
-			if (req.getStorage('userInfo')) {
-				path += '&userId=' + req.getStorage('userInfo').id;
-			}
-			if (req.getStorage('MERCHANT') && req.getStorage('MERCHANT').id != null) {
-				path += '&merchantId=' + req.getStorage('MERCHANT').id;
-		
-				if (req.getStorage('smallShop') && req.getStorage('MERCHANT').id != null) {
-					path += '&shopId=' + req.getStorage('smallShop').id;
-				}
-			}
-			let title = '';
-			if (this.merchant && this.merchant.title && this.merchant.title != '默认门店') {
-				title = this.merchant.title;
-			} else {
-				title = this.config.CONFIG_PROJECT_TITLE;
-			}
-			return {
-				title: (req.excludeSpecial(req.getStorage('userInfo').nickName) ? req.excludeSpecial(req.getStorage('userInfo').nickName) : '') + '为你推荐' + title,
-				path: path
-			};
-		},
-		onShareTimeline() {
-			let path = 'isShare=' + true;
-			if (req.getStorage('userInfo')) {
-				path += '&userId=' + req.getStorage('userInfo').id;
-			}
-			if (req.getStorage('MERCHANT') && req.getStorage('MERCHANT').id != null) {
-				path += '&merchantId=' + req.getStorage('MERCHANT').id;
-		
-				if (req.getStorage('smallShop') && req.getStorage('MERCHANT').id != null) {
-					path += '&shopId=' + req.getStorage('smallShop').id;
-				}
-			}
-			let title = '';
-			if (this.merchant && this.merchant.title && this.merchant.title != '默认门店') {
-				title = this.merchant.title;
-			} else {
-				title = this.config.CONFIG_PROJECT_TITLE;
-			}
-			return {
-				title: (req.excludeSpecial(req.getStorage('userInfo').nickName) ? req.excludeSpecial(req.getStorage('userInfo').nickName) : '') + '为你推荐' + title,
-				query: path
-			};
-		}
-	}
-</script>
-
-<style>
-	@import "./index.css";
-</style>

pages/live/live.css

@@ -1,12 +0,0 @@
-/* pages/live/live.wxss */
-.list{padding: 20rpx 20rpx 0;overflow: hidden;}
-.list .li{background: #fff;border-radius: 12rpx;padding: 20rpx 20rpx 40rpx;margin-bottom: 20rpx;}
-.zbimg{width: 100%;height: 350rpx;}
-.title{font-size: 36rpx;color: #333;margin: 25rpx 0;}
-.sta{font-size: 28rpx;color: #FE0419;margin-right: 50rpx;align-items: center;}
-.sta.end{color: #999;}
-.sta image{width: 33rpx;height: 25rpx;margin-right: 9rpx;}
-.ren{font-size: 28rpx;color: #999;align-items: center;}
-.ren image{width: 25rpx;height: 26rpx;margin-right: 9rpx;}
-.into{width: 154rpx;height: 52rpx;border: 2rpx solid #FE0419;border-radius: 26rpx;line-height: 52rpx;font-size: 24rpx;color: #FE0419;text-align: center;}
-.notstart{width: 154rpx;height: 52rpx;border: 2rpx solid #999;border-radius: 26rpx;line-height: 52rpx;font-size: 24rpx;color: #333;text-align: center;}

pages/live/live.vue

@@ -1,187 +0,0 @@
-<template>
-<view>
-<!--pages/live/live.wxml-->
-<view class="list" v-if="pageList.length > 0">
-  <block v-for="(item, index) in pageList" :key="index">
-  <view class="li" @tap="intoLive" :data-id="item.roomid" :data-index="index">
-    <image :src="item.share_img" mode="scaleToFill" class="zbimg"></image>
-    <view class="title">{{item.name}}</view>
-    <view class="dflex">
-      <view class="sta dflex flex" v-if="item.live_status == 101"><image src="/static/pages/images/zbico.png"></image>直播中</view>
-      <view class="sta dflex flex" v-else-if="item.live_status == 102"><image src="/static/pages/images/zbico.png"></image>{{item.time}}开播</view>
-      <view class="sta end dflex flex" v-else><image src="/static/pages/images/zbico1.png"></image>已结束</view>
-      <!-- <view class="ren dflex flex"><image src="/pages/images/ren.png"></image>6247</view> -->
-      <view class="into" v-if="item.live_status == 103">查看回放</view>
-      <view class="into" v-else>进入直播</view>
-      <!-- <view class="into" wx:if="{{item.live_status == 102}}">开播提醒</view> -->
-    </view>
-  </view>
-  </block>
-  <footer-copyright></footer-copyright>
-</view>
-<view class="nodata" v-if="ishow">
-  <image :src="picUrlss+'empty_zb.png'"></image>
-  <text>暂无直播</text>
-</view>
-
-
-
-<!-- <view class="placeholder-view" :style="'height:' + (bottomBlankHeignt + 115) + 'rpx'"></view> -->
-<foot channel="live" :isUpdate="isUpdate"></foot>
-</view>
-</template>
-
-<script>
-// pages/live/live.js
-const app = getApp();
-const req = require("../../utils/request.js");
-const util = require("../../utils/util.js");
-import foot from "../../components/nav-bar/index";
-import footerCopyright from "../../components/footer-copyright/footer-copyright";
-
-export default {
-  data() {
-    return {
-		picUrlss: req.public.picUrls,
-      bottomBlankHeignt: app.globalData.isIPhoneX ? 68 : 0,
-      page: 1,
-      pageList: [],
-      isLoad: true,
-      isUpdate: false // 是否更新消息
-      ,
-      hasmore: false,
-      ishow: false
-    };
-  },
-
-  components: {
-    foot,
-    footerCopyright
-  },
-  props: {},
-
-  onLoad() {// this.getList()
-  },
-
-  onShow() {
-    this.getList();
-    this.setData({
-      isUpdate: !this.isUpdate
-    });
-  },
-
-  onReachBottom() {
-    this.page++;
-    this.getList();
-  },
-
-  methods: {
-    getList() {
-      let that = this;
-      let isShowLoading = false;
-      // console.log(that.isLoad);
-      if (!that.isLoad) return false;
-      that.isLoad = false;
-      let form = {
-        page: that.page,
-        limit: 10
-      };
-
-      if (form.page == 1 && !isShowLoading) {
-        req.loadIng('加载中');
-        isShowLoading = true;
-      }
-
-      req.getRequest('/api/live/list', form, data => {
-        // if (!data) return req.msg('还没有直播');
-        if (data && data.length == 10) that.isLoad = true;
-        if (that.page > 1) data = that.pageList.concat(data);
-
-        if (!data || data.length < 10) {
-          that.setData({
-            hasmore: true
-          });
-        }
-
-        if (data) {
-          data.map(item => {
-            if (item.start_time) {
-              item.time = util.transTime(item.start_time);
-            }
-
-            return item;
-          });
-        }
-
-        // console.log(data);
-        that.setData({
-          pageList: data
-        });
-
-        if (!this.pageList) {
-          that.setData({
-            ishow: true
-          });
-        } else {
-          that.setData({
-            ishow: false
-          });
-        }
-
-        if (isShowLoading) {
-          uni.hideLoading();
-          isShowLoading = false;
-        }
-      });
-    },
-
-    getLive(id) {
-      return new Promise((resolve, reject) => {
-        req.getRequest('/api/live/playBack', {
-          page: 1,
-          limit: 10,
-          room_id: id
-        }, data => {
-          this.videoList = data;
-          resolve();
-        });
-      });
-    },
-
-    intoLive(event) {
-      let roomId = event.currentTarget.dataset.id; 
-	  let index=event.currentTarget.dataset.index;
-	  // console.log(roomId)
-      // let date=this.data.pageList.filter(res=>res.roomid==roomId)
-      // // console.log(JSON.stringify(JSON.stringify(date[0])))
-      // // console.log(typeof(JSON.stringify(date[0])))
-      // res=JSON.stringify(date[0])
-	  let redirect = '/pages/liveMiddle/liveMiddle?id=' + roomId
-	  req.isLogin().then(success => {
-	  	if (success) {
-	  		uni.navigateTo({
-	  		  url: redirect // url:`plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=${roomId}`
-	  		
-	  		});
-	  	}
-	  });
-
-      
-    },
-
-    async playBack(event) {
-      let roomId = event.currentTarget.dataset.id;
-      await this.getLive(roomId);
-      let videoList = JSON.stringify(this.videoList);
-      if (videoList.length < 1) return req.msg('回放生成中');
-      uni.navigateTo({
-        url: '/pages/video/video?videoList=' + videoList
-      });
-    }
-
-  }
-};
-</script>
-<style>
-@import "./live.css";
-</style>

pages/liveMiddle/liveMiddle.css

@@ -1,35 +0,0 @@
-/* pages/liveMiddle/liveMiddle.wxss */
-.button{
-  position: fixed;
-  bottom: 267rpx;
-  left:50%;
-  transform: translateX(-50%);
-}
-.btn{
-  width: 217rpx;
-  height: 63rpx;
-  background-image: linear-gradient(to left,#FE934C,#FD3A31);
-  border-radius: 32rpx;
-  text-align: center;
-  line-height: 63rpx;
-  color: #ffffff;
-  font-size: 28rpx;
-  margin-bottom: 30rpx; 
-}
-.btn1{ 
-  width: 217rpx;
-  height: 63rpx;
-  background: #F6F8FF;
-  border-radius: 32rpx;
-  text-align: center;
-  line-height: 63rpx;
-  color: #FD4534;
-  font-size: 28rpx;
-}
-.background {
-  width: 100%;
-  height: 100%;
-  position:fixed; 
-  background-size:100% 100%;
-  z-index: -1;
-}

pages/liveMiddle/liveMiddle.vue

@@ -1,295 +0,0 @@
-<template>
-	<view>
-		<!--pages/liveMiddle/liveMiddle.wxml-->
-		<image :src="date.cover_img" class="background"></image>
-		<view class="button">
-			<view class="btn" @tap="intoLive" v-if="flag">{{star?'进入直播间':'直播未开始'}}</view>
-			<view class="btn" @tap="intoLive" v-else>查看回放</view>
-			<view class="btn1" @tap="showShare">分享海报</view>
-		</view>
-		<v-share :hide-toast="hideShare" :product="date" :code-url="codeUrl" a-type="6" @onFather="click"></v-share>
-
-		<!-- <v-share hide-toast="{{hideShare}}" product="{{pro}}" code-url="{{codeUrl}}" bg-url="{{bgUrl}}"></v-share> -->
-	</view>
-</template>
-
-<script>
-	// pages/liveMiddle/liveMiddle.js
-	const req = require("../../utils/request.js");
-	const util = require("../../utils/util.js");
-	const app = getApp();
-	import vShare from "../../components/share/share";
-
-	export default {
-		data() {
-			return {
-				flag: true,
-				hideShare: true,
-				star: true,
-				date: '',
-				codeUrl: ""
-			};
-		},
-
-		components: {
-			vShare
-		},
-		props: {},
-
-		/**
-		 * 生命周期函数--监听页面加载
-		 */
-		onLoad: function(options) {
-			this.isLoad = true;
-			this.query = options;
-
-			if (options.scene) {
-				this.scene = options.scene;
-			}
-
-			if (options.isShare) {
-				this.query.roomid = options.id;
-				req.setStorage('pidCode', options.userId);
-			}
-			this.getList().then(resolve=>{
-				// console.log("debug1", resolve);
-				this.getStar();
-			})
-			// console.log(options);
-		},
-		//分享
-		onShareAppMessage: function() {
-			// console.log('直播间详情', this.date);
-			// console.log('/pages/liveMiddle/liveMiddle?id=' + this.query.id + '&isShare=' + true + '&userId=' + req
-				// .getStorage(
-				// 	'userInfo').id);
-			return {
-				title: req.getStorage('userInfo').nickName + '邀请您观看直播：' + this.date.name,
-				imageUrl: this.date.cover_img,
-				path: '/pages/liveMiddle/liveMiddle?id=' + this.query.id + '&isShare=' + true + '&userId=' + req
-					.getStorage(
-						'userInfo').id
-			};
-		},
-
-		/**
-		 * 生命周期函数--监听页面显示
-		 */
-		onShow: async function() {
-			await this.loadCodeParams();
-		},
-		methods: {
-			click(e) {
-				// console.log(e)
-				this.hideShare = e
-			},
-			getList() {
-				return new Promise((resolve, reject) => {
-					let that = this;
-					
-					if (!that.isLoad) return false;
-					that.isLoad = false;
-					let form = {
-						page: 1,
-						limit: 100
-					};
-					let date = {};
-					req.getRequest('/api/live/list', form, data => {
-						if (data) {
-							data.map(item => {
-								item.time = util.transTime(item.start_time);
-								return item;
-							}); // console.log(data)
-					
-							data.forEach(res => {
-								if (res.roomid == this.query.id) {
-									date = res;
-								}
-							});
-							that.setData({
-								date: date
-							});
-							resolve(date);
-						}
-					});
-				});
-				
-
-			},
-
-			onShareTimeline() {
-				return {
-					title: '直播分享' + this.date.name,
-					imageUrl: this.date.cover_img
-				};
-			},
-
-			// 分享
-			showShare() {
-				// #ifndef H5
-				req.isLogin().then(success => {
-					if (success) {
-						this.getCodeUrl();
-						this.setData({
-							hideShare: false
-						});
-					}
-				});
-				// #endif
-			},
-
-			// 解析路由参数
-			loadCodeParams() {
-				let _ts = this;
-
-				// console.log(_ts.scene);
-				return new Promise((resolve, reject) => {
-					if (!_ts.scene) {
-						resolve();
-						return false;
-					}
-
-					req.getRequest('/api/code/params', {
-						scene: _ts.scene
-					}, data => {
-						// console.log(data);
-						this.query.id = data.scene;
-						req.setStorage('pidCode', data.userId);
-						resolve();
-					});
-				});
-			},
-
-			getCodeUrl() {
-				let that = this; //获取小程序码
-
-				const params = {
-					page: 'pages/liveMiddle/liveMiddle',
-					scene: this.query.id
-				};
-				// console.log("pa--", params);
-				req.getRequest('/api/program/codev', params, url => {
-					// console.log(url);
-					that.setData({
-						codeUrl: url
-					});
-				});
-			},
-
-			//获取当前直播间的状态码 101：直播中，102：未开始， 可以直接进入直播间
-			// 103已结束，  只能查看回放
-			// 104禁播，105：暂停，106：异常，107：已过期  未处理
-			getStar() {
-				// console.log(this.date.time);
-				let status = this.date.live_status;
-				this.getDate(this.date);
-				this.date.month = this.year;
-				this.date.hour = this.hour;
-				let str = this.date.share_img;
-				if (str.indexOf("https") == -1) {
-					this.date.share_img = str.replace(/http/, 'https');
-				}
-
-				let res = this.date;
-				this.setData({
-					date: res
-				}); //状态码为101
-
-				if (status == 101) {
-					this.setData({
-						flag: true,
-						star: true,
-						date: res
-					});
-				} //状态码为102
-
-
-				if (status == 102) {
-					this.setData({
-						flag: true,
-						star: false,
-						date: res
-					});
-				} //状态码为103
-
-
-				if (status == 103) {
-					this.setData({
-						flag: false
-					});
-				}
-			},
-
-			// 进入直播间
-			intoLive(event) {
-				let roomId = this.date.roomid;
-				let customParams = encodeURIComponent(JSON.stringify({
-					isShare: true,
-					userId: req.getStorage(
-						'userInfo').id
-				}))
-				// let redirect=`plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=${roomId}&custom_params=${customParams}`
-				// uni.navigateToMiniProgram({
-				// 	appId:'wxae03e9c5b5fcb1fb',
-				// 	path:redirect
-				// })
-				uni.navigateTo({
-					url: `plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=${roomId}&custom_params=${customParams}`
-				});
-			},
-
-			/**
-			 * 
-			 *  直播开始时间转换 year-month-day hour:minute:00
-			 * 
-			 */
-			getDate(str) {
-				// console.log(str)
-				if (str.time) {
-					// str = this.date.time;
-					var strArr = str.time.split(' ');
-					// console.log(strArr)
-					var time = strArr[0].toString().split('-');
-					var hose = strArr[1].toString().split(':');
-					var hour = hose[0];
-					var minute = hose[1];
-					var day = time[2];
-					var month = time[1];
-					var year = time[0];
-					var date = (month + '月' + day + '日').toString();
-					var date1 = (hour + ':' + minute).toString();
-					var date2 = strArr[0];
-					this.year = date
-					this.hour = date1
-				}
-			},
-
-			getLive(id) {
-				return new Promise((resolve, reject) => {
-					req.getRequest('/api/live/playBack', {
-						page: 1,
-						limit: 10,
-						room_id: id
-					}, data => {
-						this.videoList = data;
-						resolve();
-					});
-				});
-			},
-
-			async playBack(event) {
-				let roomId = this.date.roomid;
-				await this.getLive(roomId);
-				let videoList = JSON.stringify(this.videoList);
-				if (videoList.length < 1) return req.msg('回放生成中');
-				uni.navigateTo({
-					url: '/pages/video/video?videoList=' + videoList
-				});
-			}
-
-		}
-	};
-</script>
-<style>
-	@import "./liveMiddle.css";
-</style>

pages/search/search.css

@@ -1,35 +0,0 @@
-/* pages/search/search.wxss */
-page{background: #fff;}
-.ssbox{padding: 20rpx 30rpx 24rpx;border-bottom: 20rpx solid #f5f6f7;}
-.search{align-items: center;font-size: 26rpx;color: #666;}
-.searchs{background: #F0F2F3;height: 70rpx;border-radius: 35rpx;padding: 0 20rpx 0 30rpx;align-items: center;}
-.search image{width: 30rpx;height: 30rpx;margin-right: 13rpx;}
-.clear{margin-left: 20rpx;}
-.sbtn{padding-left: 35rpx;font-size: 28rpx;color: #333;}
-.cancel{padding-left: 35rpx;font-size: 28rpx;color: #333;}
-.lishi{padding: 35rpx 30rpx;min-height: 300rpx;}
-.tit{font-size: 28rpx;color: #333;}
-.list{margin-top: 30rpx;flex-wrap: wrap;}
-.list .li{height: 60rpx;line-height: 60rpx;background: #F3F3F3;border-radius: 10rpx;padding: 0 15rpx;font-size: 22rpx;color: #666;margin: 0 14rpx 23rpx 0;}
-.delete{width: 236rpx;height: 66rpx;border: 2rpx solid #DCDCDC;border-radius: 10rpx;font-size: 24rpx;color: #333;align-items: center;justify-content: center;margin: 80rpx auto 0;}
-.price .vip{    font-size: 24rpx;margin-left: 12rpx;color: #333;font-weight: normal;}
-.delete image{width: 30rpx;height: 30rpx;margin-right: 12rpx;}
-
-/* 猜你喜欢 */
-.cai-tit{align-items: center;justify-content: center;font-size: 30rpx;color: #EA6730;font-weight: bold;margin-bottom: 30rpx;}
-.cai-tit image{width: 63rpx;height: 5rpx;}
-.cai-tit image:first-child{margin-right: 20rpx;}
-.cai-tit image:last-child{margin-left: 20rpx;}
-.tabcon{flex-wrap: wrap;background: #f6f6f6;overflow: hidden;padding-bottom: 30rpx;}
-.tabcon .li{background: #fff;border-radius: 10rpx;width: 345rpx;margin: 20rpx 20rpx 0 0;}
-.tabcon .li:nth-child(2n){margin-right: 0;}
-.jsdimgs{width: 345rpx;height: 345rpx;position: relative;}
-.jsdpro{width: 100%;height: 100%;}
-.jsdimg{width: 82rpx;height: 36rpx;position: absolute;top: 20rpx;left: 20rpx;}
-.jsdinfo{padding: 15rpx 20rpx 30rpx;}
-.proname{font-size: 28rpx;color: #333;text-overflow: ellipsis;white-space: nowrap;overflow: hidden;margin-bottom: 20rpx;}
-.operate{justify-content: space-between;align-items: center;}
-.price{font-size: 24rpx;color: #FE0419;}
-.price text{font-size: 36rpx;font-weight: bold;}
-.price .del{font-weight: normal;font-size: 24rpx;color: #999;margin-left: 12rpx;text-decoration: line-through;}
-.add-cart image{width: 42rpx;height: 42rpx;}

pages/search/search.vue

@@ -1,276 +0,0 @@
-<template>
-<view>
-<!--pages/search/search.wxml-->
-<view class="ssbox bgfff">
-  <view class="search dflex">
-    <view class="searchs dflex flex">
-      <image src="/static/pages/images/ssico.png" class="ssico"></image>
-      <input name="searchTitle" placeholder="搜索你想要的商品" placeholder-class="placeholder" class="flex" :value="searchTitle" @input="search" @confirm="confirm" confirm-type="search" auto-focus focus="true"></input>
-      <image src="/static/pages/images/clear.png" class="clear" @tap="clearInput" v-if="isCuo"></image>
-    </view>
-    <view class="cancel" @tap="cancelSearch" v-if="isCancel">取消</view>
-		<view class="sbtn" @tap="confirmSearch" v-else>搜索</view>
-  </view>
-</view>
-<view class="lishi">
-  <view class="tit">历史搜索</view>
-  <view class="list dflex">
-    <view v-for="(item, index) in history" :key="index" class="li" @tap="toTapSearch" :data-value="item">{{item}}</view>
-  </view>
-  <view class="delete dflex" @tap="clearHistory" v-if="history.length > 0"><image src="/static/pages/images/delete.png"></image>清空历史记录</view>
-</view>
-<view class="cai" v-if="likeList.length>0">
-	<view class="cai-tit dflex"><image src="/static/pages/images/cai_bg1.png"></image>猜您喜欢<image src="/static/pages/images/cai_bg2.png"></image></view>
-	<view class="tabcon pdlr20 dflex">
-			<block v-for="(item, index) in likeList" :key="index">
-				<view class="li">
-					<view class="jsdimgs" @tap="toDetail" :data-id="item.id">
-						<image :src="item.pic + '?x-oss-process=style/w375'" mode="aspectFit" class="jsdpro"></image>
-						<image src="/static/pages/images/jishida.png" v-if="item.isJs == 1" class="jsdimg"></image>
-					</view>
-					<view class="jsdinfo">
-						<view class="proname" @tap="toDetail" :data-id="item.id">{{item.title}}</view>
-						<view class="operate dflex">
-							<view class="price proprice">￥<text>{{show_membership_price==1&&item.actualPrice < item.salePrice?item.actualPrice:item.salePrice}}</text></view>
-							<view class="add-cart">
-								<view class="nums dflex" v-if="item.count > 0">
-									<image src="/static/pages/images/jian.png"></image>
-									<view class="num">{{item.count}}</view>
-									<image src="/static/pages/images/jia1.png"></image>
-								</view>
-								<image src="/static/pages/images/jia.png" @tap="addShopCart" :data-id="item.id" :data-skuid="item.skuId" :data-index="index" :data-state="item.state" v-else></image>
-							</view>
-						</view>
-					</view>
-				</view>
-			</block>
-		</view>
-</view>
-</view>
-</template>
-
-<script>
-// pages/search/search.js
-const app = getApp();
-const req = require("../../utils/request.js");
-
-export default {
-  data() {
-    return {
-      searchTitle: '',
-      history: [],
-      page: 1,
-      likeList: [],
-      isLikeLoad: true,
-      merchant: {},
-      isCancel: true,
-      isCuo: false,
-      merchantId: "",
-      show_membership_price: 0
-    };
-  },
-
-  components: {},
-  props: {},
-
-  onLoad(options) {
-    this.query = options;
-
-    if (options.searchTitle) {
-      this.setData({
-        searchTitle: options.searchTitle
-      });
-    }
-
-    if (options.merchantId) {
-      this.setData({
-        merchantId: options.merchantId
-      });
-    } else {// this.setData({merchantId:req.getStorage("defaultMerchant").id})
-    }
-
-    // console.log(options);
-  },
-
-  onShow(options) {
-    this.getConfig();
-    let history = req.getStorage('HISTORYS'); // let merchant = req.getStorage("MERCHANT");
-
-    this.setData({
-      history: history // merchant:merchant
-
-    });
-    this.getLikeList();
-  },
-
-  methods: {
-    getConfig() {
-      var _this = this;
-
-      return new Promise((resolve, reject) => {
-        req.getRequest('/api/config', {}, function (res) {
-          if (res && res.show_membership_price == 1) {
-            _this.setData({
-              show_membership_price: 1
-            });
-          }
-
-          resolve();
-        });
-      });
-    },
-
-    search(e) {
-      this.searchTitle = e.detail.value;
-      this.setData({
-        searchTitle: e.detail.value
-      });
-
-      if (this.searchTitle.length > 0) {
-        this.setData({
-          isCancel: false,
-          isCuo: true
-        });
-      } else {
-        this.setData({
-          isCancel: true,
-          isCuo: false
-        });
-      }
-
-      return e.detail.value.replace(/\s+/g, '').replace(/[^\u4e00-\u9fa5a-zA-Z0-9\w]/g, '');
-    },
-
-    cancelSearch() {
-      uni.navigateBack();
-    },
-
-    clearInput() {
-      this.setData({
-        searchTitle: '',
-        isCancel: true,
-        isCuo: false
-      });
-    },
-
-    addShopCart(e) {
-      let state = e.currentTarget.dataset.state;
-      let skuId = e.currentTarget.dataset.skuid;
-      let id = e.currentTarget.dataset.id;
-      let params = {
-        skuId: skuId,
-        quantity: 1,
-        productId: id
-      }; // if(state!=1){
-      //   return req.msg('您来晚了，商品已经下架')
-      // }
-
-      if (this.merchantId) {
-        params.merchantId = this.merchantId;
-      }
-
-      req.postRequest('/api/purchase/cart', params, res => {
-        req.msg('加入购物车成功');
-      });
-    },
-
-    confirm(e) {
-      let value = e.detail.value;
-      if (!value) return req.msg('请输入商品名称');
-      this.toSearch(value, true);
-    },
-
-    confirmSearch() {
-      let value = this.searchTitle;
-      if (!value) return req.msg('请输入商品名称');
-      this.toSearch(value, true);
-    },
-
-    toTapSearch(e) {
-      let value = e.currentTarget.dataset.value;
-      this.toSearch(value, false);
-    },
-
-    toSearch(value, isSave) {
-      let supplier = '';
-
-      if (this.query.supplier) {
-        supplier = '&supplier=' + this.query.supplier;
-      }
-
-      if (this.merchantId) {
-        if (this.query.shopId) {
-          app.globalData.redirectTab('product/list/list?searchTitle=' + value+'&merchantId='+this.query.merchantId + '&shopId=' + this.query.shopId + supplier);
-        } else {
-          app.globalData.redirectTab('product/list/list?searchTitle=' + value + '&merchantId=' + this.merchantId + supplier);
-        }
-      } else {
-        app.globalData.redirectTab('product/list/list?searchTitle=' + value + supplier);
-      }
-
-      if (isSave) {
-        let historys = this.history;
-
-        if (historys.length < 1) {
-          historys = [];
-          historys.unshift(value);
-        } else {
-          historys.unshift(value);
-        }
-
-        req.setStorage('HISTORYS', historys);
-      }
-    },
-
-    clearHistory() {
-      req.removeStorage('HISTORYS');
-      this.setData({
-        history: []
-      });
-    },
-
-    getLikeList() {
-      //Recommend
-      if (!this.isLikeLoad) return false;
-      this.isLikeLoad = false;
-      let that = this;
-      let form = {
-        page: that.page,
-        limit: 10,
-        attr: 'sell_well'
-      };
-
-      if (this.merchantId) {
-        form.merchantId = this.merchantId;
-      }
-
-      req.getRequest('/api/product/list', form, res => {
-        if (res && res.length >= 10) that.isLikeLoad = true;
-        if (that.page > 1) res = that.likeList.concat(res);
-        res = res.map(it => {
-          if (it.deliverWay && JSON.parse(it.deliverWay).indexOf(3) != -1) it.isJs = true;
-          return it;
-        });
-        that.setData({
-          likeList: res
-        });
-      });
-    },
-
-    toDetail(e) {
-      let id = e.currentTarget.dataset.id;
-      // console.log(id);
-
-      if (this.merchantId) {
-        app.globalData.openPage('product/detail/detail?id=' + id + "&merchantId=" + this.merchantId);
-      } else {
-        app.globalData.openPage('product/detail/detail?id=' + id);
-      }
-    }
-
-  }
-};
-</script>
-<style>
-@import "./search.css";
-</style>

pages/sort/sort.css

@@ -1,66 +0,0 @@
-/* pages/sort/sort.wxss */
-page {background: #fff;}
-.search-box{background: #fff;padding: 0 30rpx 30rpx;height: 70rpx;position: fixed;top: 0;left: 0;right: 0;z-index: 50;}
-.search{background: #f7f7f7;border-radius: 35rpx;justify-content: center;font-size: 28rpx;color: #999;height: 70rpx;}
-.search image{width: 30rpx;height: 30rpx;margin-right: 20rpx;}
-.left {width: 22%;background: #F0F0F0;position: fixed;left: 0;top: 99rpx;font-size: 26rpx;content: #333;bottom: 115rpx;z-index: 51;}
-.left .li {line-height: 100rpx;text-align: center;text-overflow: ellipsis;white-space: nowrap;overflow: hidden;}
-.left .li.active {font-weight: bold;background: #fff;border-left: 6rpx solid var(--mina) !important;}
-.right {width: 78%;background: #fff;position: absolute;right: 0;top: 100rpx;padding-top: 80rpx;padding-bottom: 115rpx;}
-.right-top{position: fixed;top: 99rpx;left: 0;right: 20rpx;z-index: 50;padding-left: 22%;background: #fff;padding-bottom: 30rpx;}
-.coupons{background: #FFEBEB;border-radius: 8rpx;padding: 11rpx 15rpx 20rpx 13rpx;line-height: 50rpx;align-items: flex-start;margin-bottom: 30rpx;margin-left: 20rpx;}
-.coupons-list{height: 50rpx;}
-.coupons-s{height: 70rpx;white-space: nowrap;}
-.coupons-list .li{display: inline-block;height: 50rpx;background: linear-gradient(90deg, #FE934C 0%, #FD3A31 100%);border-radius: 8rpx;font-size: 24rpx;color: #fff;margin: 0 15rpx 0 0;vertical-align: top;}
-.coupons-tit{height: 50rpx;padding: 0 18rpx;border-right: 2rpx dashed rgba(255,255,255,.3);position: relative;}
-.coupons-tit::before,.coupons-tit::after{content: '';display: block;width: 13rpx;height: 13rpx;background: #FFEBEB;position: absolute;right: -6rpx;border-radius: 50%;}
-.coupons-tit::before{top: -6rpx;}
-.coupons-tit::after{bottom: -6rpx;}
-.coupons-list .li text{padding: 0 20rpx;}
-.coupon-num{font-size: 24rpx;color: #CD0B01;}
-.rico{width: 12rpx;height: 21rpx;margin-left: 12rpx;}
-.tab {white-space: nowrap;-webkit-overflow-scrolling: touch;box-sizing: border-box;}
-.tab .li {display: inline-block;padding: 0 20rpx;line-height: 48rpx;background: #F7F7F7;margin-right: 10rpx;border-radius: 24rpx;}
-.tab .li:first-child{margin-left: 20rpx;}
-.tab .li:last-child {margin-right: 0;}
-.tab .li.active {color: var(--mina) !important;}
-.sort {padding: 0 0 0 20rpx;box-sizing: border-box;}
-.price .vip {font-size: 24rpx;margin-left: 12rpx;color: var(--vip);border: 1rpx solid;padding: 0 8rpx 2rpx 8rpx;border-radius: 5px;font-weight: normal;}
-.price .vip .members {font-size: 24rpx !important;font-weight: normal !important;margin-left: 2rpx;}
-.price .vip .sale {font-size: 24rpx !important;font-weight: normal !important;}
-.price text.del {font-weight: normal;font-size: 24rpx;color: #999;margin-left: 12rpx;text-decoration: line-through;}
-.sort .li {border-bottom: 2rpx solid #eee;padding-bottom: 39rpx;margin-bottom: 39rpx;overflow: hidden;padding-right: 20rpx;}
-.sort .li:last-child {margin-bottom: 0;}
-.sort .li .flex {overflow: hidden;}
-.proimgs{width: 160rpx;height: 160rpx;border-radius: 10rpx;position: relative;margin-right: 18rpx;border: 2rpx solid #E5E5E5;}
-.proimg {box-sizing: border-box;width: 100%;height: 100%;border-radius: 10rpx;}
-.shouqing{width: 100%;height: 100%;border-radius: 10rpx;position: absolute;top: 0;left: 0;}
-.proname {font-size: 28rpx;color: #333;
-	/* text-overflow: ellipsis;
-	white-space: nowrap; */
-	line-height: 36rpx;height: 73rpx;overflow: hidden;}
-.pronames {font-size: 24rpx;color: #999;margin-top: 5rpx;}
-.endtime {display: inline-block;height: 32rpx;line-height: 32rpx;border: 2rpx solid #FE0419;border-radius: 6rpx;padding: 0 8rpx;font-size: 24rpx;color: #FE0419;margin: 15rpx 0 65rpx;}
-.operate {justify-content: space-between;align-items: center;margin-top: 10rpx;}
-.price {font-size: 24rpx;color: #FE0419;align-items: center;display: flex;flex-wrap: nowrap;}
-.price text {font-size: 36rpx;font-weight: bold;}
-.add-cart image {width: 42rpx;height: 42rpx;}
-.nums {align-items: center;}
-.num {font-size: 30rpx;width: 50rpx;text-align: center;line-height: 42rpx;}
-/* 分类2 */
-.sort-left {width: 22%;background: #F0F0F0;position: fixed;left: 0;top: 99rpx;font-size: 26rpx;content: #333;}
-.sort-left .li {line-height: 100rpx;text-align: center;height: 101rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
-.sort-left .li.active {font-weight: bold;background: #fff;border-left: 6rpx solid var(--mina) !important;}
-.sort-right {width: 78%;position: absolute;right: 0;top: 99rpx;box-sizing: border-box;}
-.sort-right .rcon {padding: 0 20rpx 20rpx;}
-.sort-right .tit {padding: 25rpx 0 15px;font-size: 28rpx;color: #9A9A9A;}
-.sort-right .list {flex-wrap: wrap;background: #fff;border-radius: 10rpx;padding: 40rpx 15rpx 0;overflow: hidden;}
-.sort-right .list .li {margin-bottom: 55rpx;width: 33.33%;text-align: center;font-size: 28rpx;color: #666;}
-.sort-right .list image {display: block;width: 120rpx;height: 120rpx;margin: 0 auto 10rpx;}
-.litext {width: 120rpx;height: 120rpx;border-radius: 50%;font-size: 40rpx;color: #fff;text-align: center;line-height: 120rpx;background: #f3f1f2;margin: 0 auto 15rpx;}
-.nopronames {height: 31rpx;}
-
-
-.vip-news{height: 36rpx;background: #222222;border-radius: 8rpx;line-height: 36rpx;flex-wrap: nowrap;margin-left: 12rpx;font-weight: bold;}
-.vip-sale{background: linear-gradient(to right,#f9e0bc,#d9a168);font-size: 20rpx !important;color: #222;height: 36rpx;border-radius: 8rpx 0 0 8rpx;white-space: nowrap;width: 70rpx;text-align: center;}
-.vip-members{padding: 0 8rpx 0 5rpx;font-size: 22rpx !important;color: #fde9cd !important;white-space: nowrap;}

pages/sort/sort.vue

@@ -1,682 +0,0 @@
-<template>
-	<view>
-		<view class="search-box">
-			<view class="search ddflex" @click="search()">
-				<image src="../../static/images/ssico.png"></image>
-				<view>搜索商品</view>
-			</view>
-		</view>
-		<block v-if="sort">
-			<!-- #ifndef H5 -->
-			<scroll-view scroll-y="true" class="sort-left" :style="'bottom:' + (bottomBlankHeignt + 115) + 'rpx;'">
-				<block v-for="(item, index) in sortCategorys" :key="index">
-					<view :class="'li ' + (selectTab == index ? 'active' : '')" :data-index="index" @tap="toScrollView"
-						:data-id="item.id">{{item.title}}</view>
-				</block>
-			</scroll-view>
-			<!-- #endif -->
-			<!-- #ifdef H5 -->
-			<scroll-view scroll-y="true" class="sort-left"
-				:style="'bottom:' + (bottomBlankHeignt + 115) + 'rpx;' +'top: 43px'">
-				<block v-for="(item, index) in sortCategorys" :key="index">
-					<view :class="'li ' + (selectTab == index ? 'active' : '')" :data-index="index" @tap="toScrollView"
-						:data-id="item.id">{{item.title}}</view>
-				</block>
-			</scroll-view>
-			<!-- #endif  -->
-			<scroll-view scroll-y="true" class="sort-right" :style="'height:' + scrollHeight + 'px;'"
-				:scroll-into-view="toView" scroll-top="0" @scroll="scrollTo" scroll-with-animation="true">
-				<view class="rcon">
-					<view v-for="(cats, idx) in sortCategorys" :key="idx" :id="'position' + idx">
-						<view class="tit" @tap="goUrl" :data-id="cats.id" :data-title="cats.title">{{cats.title}}</view>
-						<view class="list dflex">
-							<view v-for="(item, index) in cats.nodes" :key="index" class="li" @tap="goUrl"
-								:data-id="item.id" :data-title="item.title">
-								<image :src="item.icon" v-if="item.icon" lazy-load="true"></image>
-								<view class="litext" :data-key="key" :style="'background-color:' + item.colors" v-else>
-									{{item.first}}
-								</view>
-								{{item.title}}
-							</view>
-						</view>
-					</view>
-				</view>
-			</scroll-view>
-		</block>
-		<block v-else>
-			<!-- #ifndef H5 -->
-			<scroll-view scroll-y="true" class="left savepadding">
-				<block v-for="(item, index) in categorys" :key="index">
-					<view :class="'li ' + (current == index ? 'active' : '')" :data-current="index" :data-id="item.id"
-						@tap="cateTab">{{item.title}}</view>
-				</block>
-			</scroll-view>
-			<!-- #endif -->
-			<!-- #ifdef H5 -->
-			<scroll-view scroll-y="true" class="left"
-				:style="'bottom:' + (bottomBlankHeignt + 115) + 'rpx;'+'top: 43px;'">
-				<block v-for="(item, index) in categorys" :key="index">
-					<view :class="'li ' + (current == index ? 'active' : '')" :data-current="index" :data-id="item.id"
-						@tap="cateTab">{{item.title}}</view>
-				</block>
-			</scroll-view>
-			<!-- #endif  -->
-			<view class="right" :style="'padding-top:' +heightEle+'rpx'">
-				<view class="savepadding">
-					<view class="right-top">
-						<view class="coupons" @click="jumpUrl('/product/couponList/index?categoryId='+categorys[current].id)" v-if="couponList.length>0 && is_show_coupons == 1">
-							<view class="ddflex" style="justify-content: space-between;">
-								<view class="coupon-num">{{couponList.length}}个优惠</view>
-								<image src="../../static/pages/images/rico_red.png" class="rico"></image>
-							</view>
-							<view class="coupons-list fflex">
-								<scroll-view scroll-x="true" class="coupons-s">
-									<view class="li" v-for="(item,index) in couponList" :key="index" @click.stop="recieveCoupon(item,index)">
-										<view class="ddflex">
-											<view class="coupons-tit">{{item.couponTitle}}</view>
-											<text>{{item.userCount >= item.userReceive&&item.userCount!=0&&item.userReceive!=-1 ? '已领' : '领'}}</text>
-										</view>
-									</view>
-								</scroll-view>
-							</view>
-						</view>
-						<scroll-view scroll-X="true" class="tab">
-							<view :class="'li ' + (currents == -1 ? 'active' : '')" @tap="all">全部</view>
-							<block v-for="(item, index) in cates" :key="index" v-if="!merchantId">
-								<view :class="'li ' + (currents == index ? 'active' : '')" @tap="cateTabs"
-									:data-currents="index" :data-id="item.id">{{item.title}}{{merchantId}}</view>
-							</block>
-						</scroll-view>
-					</view>
-					<view class="sort">
-						<block v-for="(item, index) in pageList" :key="index">
-							<view class="li dflex">
-								<view class="proimgs" @tap="toDetail" :data-id="item.id">
-									<image :src="item.pic + '?x-oss-process=style/w160'" mode="aspectFit" class="proimg" lazy-load="true"></image>
-									<image src="../../static/pages/images/shouqing.png" class="shouqing" v-if="item.stock < 1"></image>
-								</view>
-								<view class="flex">
-									<view class="proname" @tap="toDetail" :data-id="item.id">{{item.title}}</view>
-									<view :class="[item.brandName?'':'nopronames','pronames']">
-										{{item.brandName?item.brandName:''}}
-									</view>
-									<view class="operate dflex">
-										<view class="price">
-											￥<text>{{item.salePrice}}</text>
-											<view class="vip-news ddflex" v-if="show_membership_price==1&&item.actualPrice < item.salePrice"><text class="vip-sale">会员价</text><text class="vip-members">￥{{item.actualPrice}}</text></view>
-											<view class="vip-news ddflex" v-if="show_membership_price==1&&item.membersPrice<item.salePrice"><text class="vip-sale">会员价</text><text class="vip-members">￥{{item.membersPrice}}</text></view>
-											<!-- <text class="vip" v-if="show_membership_price==1&&item.actualPrice < item.salePrice"><text class="sale">VIP</text><text class="members">{{item.actualPrice}}</text></text>
-											<text class="vip"
-												v-if="show_membership_price==1&&item.membersPrice<item.salePrice"><text
-													class="sale">VIP</text><text
-													class="members">{{item.membersPrice}}</text></text> -->
-											<text class="del" v-if="show_membership_price!=1">
-												<block v-if="item.marketPrice!=0&&item.marketPrice>item.salePrice">
-													￥{{item.marketPrice}}
-												</block>
-											</text>
-										</view>
-										<view class="add-cart"><!-- addShopCart -->
-											<image src="/static/pages/images/jia.png" @tap="toDetail" :data-id="item.id"
-												:data-skuid="item.skuId" :data-index="index" :data-state="item.state">
-											</image>
-										</view>
-									</view>
-								</view>
-							</view>
-						</block>
-						<view class="nodata nosp bgfff" v-if="show">
-							<image :src="picUrlss+'empty_sp.png'"></image>
-							<text>暂无商品</text>
-						</view>
-					</view>
-				</view>
-			</view>
-		</block>
-
-
-		<foot channel="sort" :isUpdate="isUpdate"></foot>
-	</view>
-</template>
-
-<script>
-	// pages/sort/sort.js
-	//获取应用实例
-	const app = getApp();
-	const req = require("../../utils/request.js");
-	let scrollDdirection = 0; // 用来计算滚动的方向
-	import foot from "../../components/nav-bar/index";
-
-	export default {
-		data() {
-			return {
-				picUrlss: req.public.picUrls,
-				bottomBlankHeignt: app.globalData.isIPhoneX ? 68 : 0,
-				categorys: [],
-				//产品一级分类列表
-				cates: [],
-				//产品二级分类列表
-				current: 0,
-				currents: -1,
-				page: 1,
-				sort: false,
-				sortCategorys: [],
-				//产品一级分类列表
-				selectTab: 0,
-				scrollTop: 0,
-				scrollHeight: 0,
-				// 滚动视图的高度
-				toView: 'position0',
-				// 滚动视图跳转的位置
-				scrollInfo: [],
-				isload: false,
-				// 自定义自己喜欢的颜色
-				colorArr: ["#e83fa0", "#0cd4c5", "#b146f4", "#18c88b", "#227bfe", "#e8a52f", "#f78d58"],
-				// 存储随机颜色
-				randomColorArr: [],
-				isUpdate: false // 是否更新消息
-					,
-				merchantId: "",
-				id: "",
-				show_membership_price: 0,
-				Is_Store_Price_Stock: 0,
-				is_show_coupons: 0,
-				pageList: [],
-				_key: "",
-				show: Boolean,
-				cateid:'',
-				couponList: [],
-				heightEle: ''
-			};
-		},
-
-		components: {
-			foot
-		},
-		props: {},
-		onLoad: async function(options) {
-			// console.log(options);
-			this.setData({
-				current: options.current ? options.current : 0,
-				merchantId: options.merchantId,
-				id: options.id
-			});
-			await this.getConfig();
-			uni.getSystemInfo({
-				success: res => {
-					this.setData({
-						scrollHeight: res.windowHeight - 136 * res.windowWidth / 750
-					});
-				}
-			});
-			if (this.sort) this.sortCategory();
-			else this.category('0', 'categorys', options.id);
-		},
-
-		onShow() {
-			this.setData({
-				isUpdate: !this.isUpdate
-			});
-		},
-
-		onReachBottom() {
-			this.page++;
-			if(this.currents>-1){
-				this.getList(this.cateid);
-			}else{
-				this.getList(this.id);
-			}
-		},
-		methods: {
-			loadCoupon(id) {
-				let form = {
-					page: 1,
-					limit: 4,
-					categoryId: id,
-					bindType: 'use'
-				};
-				return new Promise((resolve,reject)=>{
-					req.getRequest('/api/coupon/list', form, data => {
-						if(data&&data.length>0){
-							this.couponList = data;
-						}else{
-							this.couponList = [];
-						}
-						resolve()
-					});
-				})
-			},
-			getConfig() {
-				var _this = this;
-				return new Promise((resolve, reject) => {
-					req.getRequest('/api/config', {}, function(res) {
-						if (res && res.Product_Sort_ico == 1) _this.setData({
-							sort: true
-						});
-
-						if (res && res.show_membership_price == 1) {
-							_this.setData({
-								show_membership_price: 1
-							});
-						}
-
-						if (res && res.Is_Store_Price_Stock == 1) {
-							_this.setData({
-								Is_Store_Price_Stock: 1
-							});
-						}
-						if (res && res.is_show_coupons == 1) {
-							_this.is_show_coupons = 1
-						}
-
-						resolve();
-					});
-				});
-			},
-
-			category(id, dataName, listId) {
-				//产品分类
-				let that = this;
-				// console.log(id, dataName, listId);
-				let from = {
-					page: 1,
-					size: 1000,
-					pid: id
-				};
-
-				if (this.Is_Store_Price_Stock == 1) {
-					if (req.getStorage('smallShop')) {
-						from.merchantId = req.getStorage('smallShop').merchantDTO.id;
-					} else if (req.getStorage('MERCHANT')) {
-						from.merchantId = req.getStorage('MERCHANT').id;
-					}
-				}
-
-				req.getRequest('/api/category/list', from, async res => {
-					// console.log(res);
-					let data = {};
-					data[dataName] = res;
-					if (id == 0) {
-						if (listId) {
-							this.getList(listId); // this.initCate(listId, 'cates');
-						} else {
-							if(this.is_show_coupons == 1){
-								await this.loadCoupon(res[0].id);
-							}
-							await this.initCate(res[0].id, 'cates');
-							await this.getList(res[0].id);
-							that.setData({
-								id: res[0].id
-							});
-						}
-					}
-
-					that.setData(data);
-					// console.log(data);
-				});
-			},
-
-			async initCate(id, dataName) {
-				await this.category(id, dataName); // if(this.data.merchantId){
-				//   return false
-				// }
-
-				this.getList(id);
-			},
-
-			async cateTab(e) {
-				let current = e.currentTarget.dataset.current;
-				let id = e.currentTarget.dataset.id;
-				this.categoryId = id; // this.category(id, 'cates')
-				// this.getList(id)
-
-				this.setData({
-					current: current,
-					currents: -1,
-					id: id,
-					page: 1,
-					pageList: []
-				});
-				this.couponList = [];
-				this.heightEle = '';
-				if(this.is_show_coupons == 1){
-					await this.loadCoupon(id);
-				}
-				await this.initCate(id, 'cates');
-			},
-
-			getList(id) {
-				// console.log("====================")
-				//产品列表
-				let that = this;
-				var startTime = new Date().getTime();
-				// console.log(id);
-				let from = {
-					page: that.page,
-					limit: 6,
-					categoryId: id
-				};
-
-				if (this.Is_Store_Price_Stock == 1) {
-					if (req.getStorage('MERCHANT')) {
-						if (req.getStorage('MERCHANT').isDefault != 1) {
-							from.merchantId = req.getStorage('MERCHANT').id;
-						} else {
-							delete from.merchantId;
-						}
-					}
-				} // if (!that.data.isLoad) return false;
-				// that.data.isLoad = false;
-				const systemInfo = uni.getSystemInfoSync();
-				// px转换到rpx的比例
-				if(!this.heightEle){
-					let pxToRpxScale = 750 / systemInfo.windowWidth;
-					uni.createSelectorQuery().in(this).select(".right-top").boundingClientRect(data => {
-					  this.heightEle = data.height*pxToRpxScale
-					  console.log('this.heightEle==',this.heightEle)
-					  this.$forceUpdate();
-					}).exec()
-				}
-
-				req.getRequest('/api/product/list', from, res => {
-					// console.log(new Date().getTime() - startTime);
-					if (res && res.length >= 10) that.isLoad = true;
-					if (that.page > 1) res = that.pageList.concat(res);
-					if (res.length <= 0) {
-						that.setData({
-							show: true
-						})
-					} else {
-						that.setData({
-							show: false
-						})
-					}
-					that.setData({
-						pageList: res
-					});
-				});
-			},
-
-			cateTabs(e) {
-				let current = e.currentTarget.dataset.currents;
-				let id = e.currentTarget.dataset.id;
-				this.setData({
-					currents: current,
-					page: 1,
-					pageList: [],
-					cateid: id
-				});
-				this.getList(id);
-			},
-
-			all() {
-				// console.log(this.id); // this.getList(this.data.id)
-
-				this.setData({
-					currents: -1
-				});
-				this.initCate(this.id, 'cates');
-			},
-
-			toDetail(e) {
-				let id = e.currentTarget.dataset.id; // let merchant = e.currentTarget.dataset.merchant
-				// let shopId = e.currentTarget.dataset.shopid
-
-				if (this.Is_Store_Price_Stock == 1) {
-					if (req.getStorage('smallShop')) {
-						var merchantId = req.getStorage('smallShop').merchantDTO.id;
-						var shopId = req.getStorage('smallShop').id;
-						app.globalData.openPage("product/detail/detail?id=" + id + "&merchantId=" + merchantId +
-							"&shopId=" + shopId);
-					} else if (req.getStorage('MERCHANT')) {
-						if (req.getStorage('MERCHANT').isDefault != 1) {
-							merchantId = req.getStorage('MERCHANT').id;
-							app.globalData.openPage("product/detail/detail?id=" + id + "&merchantId=" + merchantId);
-						} else {
-							app.globalData.openPage("product/detail/detail?id=" + id);
-						}
-					}
-				} else {
-					app.globalData.openPage("product/detail/detail?id=" + id);
-				} // if (!shopId) {
-				//   app.openPage("product/detail/detail?id=" + id + "&merchantId=" + merchantId)
-				// } else {
-				//   app.openPage("product/detail/detail?id=" + id + "&merchantId=" + merchantId + "&shopId=" + shopId)
-				// }
-				// app.openPage("product/detail/detail?id=" + id)
-
-			},
-
-			addShopCart(e) {
-				let that = this;
-				let skuId = e.currentTarget.dataset.skuid;
-				let id = e.currentTarget.dataset.id;
-				let index = e.currentTarget.dataset.index;
-				let pageList = that.pageList;
-				let state = e.currentTarget.dataset.state; // let merchant = req.getStorage('MERCHANT');
-
-				req.isLogin().then(success => {
-					if (success) {
-						let params = {
-							skuId: skuId,
-							quantity: 1,
-							productId: id
-						};
-
-						if (req.getStorage('smallShop')) {
-							params.merchantId = req.getStorage('smallShop').merchantDTO.id;
-							params.shopId = req.getStorage('smallShop').id;
-						} else if (req.getStorage('MERCHANT')) {
-							params.merchantId = req.getStorage('MERCHANT').id;
-						} // if(state!=1){
-						//   return req.msg('您来晚了，商品已经下架')
-						// }
-
-
-						req.postRequest('/api/purchase/cart', params, res => {
-							that.setData({
-								isUpdate: !that.isUpdate
-							});
-							req.msg('加入购物车成功');
-						});
-					}
-				});
-			},
-
-			sortCategory() {
-				//产品分类
-				let that = this;
-				let params = {
-					page: 1,
-					size: 1000
-				};
-
-				if (this.Is_Store_Price_Stock == 1) {
-					if (req.getStorage('smallShop')) {
-						params.merchantId = req.getStorage('smallShop').merchantDTO
-							.id; // params.shopId= req.getStorage('smallShop').id
-					} else if (req.getStorage('MERCHANT')) {
-						if (req.getStorage('MERCHANT').isDefault != 1) {
-							params.merchantId = req.getStorage('MERCHANT').id;
-						}
-					}
-				}
-
-				req.getRequest('/api/category/list', params, res => {
-					if (res) {
-						let array = res.filter(it => it.pid == 0).map(item => {
-							item.nodes = res.filter(ite => ite.pid == item.id).map(mp => {
-								mp.first = mp.title.substr(0, 1);
-								let random = that.colorArr[Math.floor(Math.random() * that.colorArr
-									.length)];
-								mp.colors = random;
-								return mp;
-							});
-							return item;
-						});
-						that.setData({
-							sortCategorys: array
-						});
-						setTimeout(() => {
-							that.lisenerScroll();
-						}, 100);
-					}
-				});
-			},
-
-			goUrl(e) {
-				let id = e.currentTarget.dataset.id;
-				let title = e.currentTarget.dataset.title;
-
-				if (this.Is_Store_Price_Stock == 1) {
-					if (req.getStorage('smallShop')) {
-						var merchantId = req.getStorage('smallShop').merchantDTO.id;
-						app.globalData.openPage("product/list/list?id=" + id + '&smallShop=true' + '&title=' + title);
-					} else if (req.getStorage('MERCHANT')) {
-						if (req.getStorage('MERCHANT').isDefault != 1) {
-							merchantId = req.getStorage('MERCHANT').id;
-							app.globalData.openPage("product/list/list?id=" + id + "&merchantId=" + merchantId +
-								'&title=' + title);
-						} else {
-							app.globalData.openPage("product/list/list?id=" + id + '&title=' + title);
-						}
-					}
-				} else {
-					app.globalData.openPage("product/list/list?id=" + id + '&title=' + title);
-				} // app.openPage(e.currentTarget.dataset.url)
-
-			},
-
-			toScrollView(e) {
-				const {
-					index
-				} = e.currentTarget.dataset;
-				this.setData({
-					selectTab: index,
-					toView: `position${index}`
-				});
-			},
-
-			/**
-			 * 获取右边每个分类的头部偏移量
-			 */
-			lisenerScroll() {
-				// var _ts=this;
-
-				/* setTimeout(() => {
-				   _ts.setHeight(0);
-				 }, 10000);*/
-				// 获取各分类容器距离顶部的距离
-				new Promise(resolve => {
-					let query = uni.createSelectorQuery();
-					var clength = this.sortCategorys.length;
-
-					for (var k = 0; k < clength; k++) {
-						query.select(`#position${k}`).boundingClientRect();
-					}
-
-					query.exec(function(res) {
-						resolve(res);
-					});
-				}).then(res => {
-					var categorys = this.sortCategorys;
-
-					if (res.length == categorys.length) {
-						categorys.forEach((item, index) => {
-							item.offsetTop = res[index].top;
-						});
-						this.setData({
-							scrollInfo: res,
-							sortCategorys: categorys
-						});
-					}
-				});
-			},
-
-			setHeight(k) {
-				var _ts = this;
-
-				if (_ts.isload) {
-					return;
-				}
-
-				_ts.isload = false;
-				let query = uni.createSelectorQuery();
-				query.select(`#position${k}`).boundingClientRect();
-				query.exec(function(res) {
-					var _key = "categorys[" + k + "].offsetTop";
-
-					_ts.setData({
-						[_key]: res[0].top
-					});
-
-					_ts.isload = true;
-				});
-			},
-
-			/**
-			 * 监听滚动条滚动事件
-			 */
-			scrollTo(e) {
-				const scrollTop = e.detail.scrollTop; //滚动的Y轴
-
-				const {
-					selectTab,
-					sortCategorys
-				} = this;
-
-				if (scrollDdirection < scrollTop) {
-					// 向上滑动
-					scrollDdirection = scrollTop; // 计算偏移位置
-					//  console.log(current, scrollTop,categorys[current + 1].offsetTop);
-
-					if (selectTab < sortCategorys.length - 1 && scrollTop >= sortCategorys[selectTab + 1].offsetTop) {
-						// console.log("chua");
-						this.setData({
-							selectTab: selectTab + 1
-						});
-					}
-				} else {
-					// 向下滑动
-					scrollDdirection = scrollTop; // 计算偏移位置
-
-					if (selectTab > 0 && scrollTop < sortCategorys[selectTab].offsetTop && scrollTop > 0) {
-						this.setData({
-							selectTab: selectTab - 1
-						});
-					}
-				}
-			},
-			search() {
-				// app.openPage('pages/search/search')
-				app.globalData.openPage('pages/search/search')
-			},
-			recieveCoupon(item,index) {
-				let _ts = this;
-				const coupon = item;
-				if (coupon.userReceive > -1 && coupon.userCount >= coupon.userReceive) {
-					return req.msg('超出优惠券领取限制，无法领取');
-				}
-				req.postRequest('/api/coupon/receive', {
-					id: coupon.id
-				}, res => {
-					// console.log(res);
-					req.msg('领取成功', () => {
-						// console.log("11111111111111");
-						let isLoading = true;
-						this.loadCoupon(this.categorys[this.current].id);
-						// _ts.loadCoupon(isLoading);
-					});
-				});
-			},
-			jumpUrl(url){
-				uni.navigateTo({
-					url: url
-				})
-			}
-		}
-	};
-</script>
-<style>
-	@import "./sort.css";
-</style>

pages/topic/topic.css

@@ -1,81 +0,0 @@
-/* pages/topic/topic.wxss */
-/* .banner{padding: 20rpx 20rpx 0;}
-.banner image{width: 100%;height: 255rpx;border-radius: 12rpx;} */
-/* 分块一 */
-.list1{padding: 0 20rpx 20rpx;}
-.list1 .li{background: #fff;border-radius: 12rpx;padding: 20rpx;overflow: hidden;align-items: flex-start;margin-top: 20rpx;}
-.liimg{width: 200rpx;height: 200rpx;border-radius: 12rpx;margin-right: 20rpx;}
-.list1 .li .info{overflow: hidden;/* height: 200rpx; */}
-.list1 .li .title{font-size: 28rpx;color: #333;text-overflow: ellipsis;white-space: nowrap;overflow: hidden;}
-.list1 .li .infos{font-size: 24rpx;color: #999;margin: 25rpx 0 40rpx;/* height: 20rpx; */}
-.operate{justify-content: space-between;align-items: center;}
-.price{font-size: 25rpx;color: #FE0419;align-items: center;}
-.price text{font-size: 38rpx;font-weight: bold;}
-.price text.del{font-size: 24rpx !important;color: #999;text-decoration: line-through;margin-left: 15rpx;font-weight: normal;}
-.btn{width:150rpx;height:50rpx;background:linear-gradient(90deg,rgba(254,147,76,1) 0%,rgba(253,58,49,1) 100%);font-size: 24rpx;color: #fff;text-align: center;line-height: 50rpx;border-radius: 25rpx;}
-/* yml */
-.jsdimgs1{position: relative;}
-.jsdimg1{position: absolute;top: 5rpx;left: 0rpx;width: 82rpx;height: 36rpx;}
-/* 分块二 */
-.list2{flex-wrap: wrap;padding: 0 20rpx 20rpx;}
-.list2 .li{background: #fff;border-radius: 10rpx;width: 345rpx;margin: 20rpx 20rpx 0 0;overflow: hidden;}
-.list2 .li:nth-child(2n){margin-right: 0;}
-.jsdimgs{width: 345rpx;height: 345rpx;position: relative;}
-.jsdpro{width: 100%;height: 100%;border-radius: 10rpx 10rpx 0 0;}
-.proname{font-size: 28rpx;color: #333;margin-bottom: 20rpx;overflow: hidden;line-height: 36rpx;height: 72rpx;}
-.jsdimg{width: 82rpx;height: 36rpx;position: absolute;top: 20rpx;left: 20rpx;}
-.jsdinfo{padding: 15rpx 20rpx 30rpx;}
-.add-cart image{width: 42rpx;height: 42rpx;}
-.list2 .li .price{font-size: 24rpx;}
-.list2 .li .price text{font-size: 36rpx;}
-/* 分块三 */
-.list3{flex-wrap: wrap;padding: 0 20rpx 20rpx;}
-.list3 .li{background: #fff;border-radius: 10rpx;width: 220rpx;margin: 20rpx 25rpx 0 0;}
-.list3 .li:nth-child(3n){margin-right: 0;}
-.list3 .jsdimgs{width: 100%;height: 220rpx;} 
-.list3 .li .jsdinfo{padding: 10px 14px 15rpx;}
-.list3 .li .proname{margin-bottom: 10rpx;}
-.list3 .li .price{font-size: 20rpx;}
-.list3 .li .price text{font-size: 28rpx;}
-.list3 .li .jsdimg{top: 0;left: 0;}
-/* 分隔线一 */
-.list4{padding: 0 20rpx;background: #fff;}
-.list4 .li{border-radius: 0;background-color: none;border-bottom: 2rpx solid #f4f1f4;padding: 20rpx 0;margin-top: 0;}
-.list4 .li:last-child{border-bottom: none;}
-/* 分隔线二 */
-.list5{padding: 20rpx;background: #fff;}
-.list5 .li{width: 355rpx;border-radius: 0;background-color: none;border-bottom: 2rpx solid #f4f1f4;border-right: 2rpx solid #f4f1f4;margin: 0;box-sizing: border-box;padding-top: 20rpx;}
-.list5 .li:nth-child(2n){padding-left: 10rpx;border-right: none;}
-.list5 .li:nth-child(3n){padding-right: 10rpx;}
-.list5 .li:first-child{padding-right: 10rpx;}
-.list5 .li:first-child,.list5 .li:nth-child(2){padding-top: 0;}
-/* .list5 .li:nth-last-child(2),.list5 .li:last-child{border-bottom: none;} */
-.list5 .li:last-child{border-bottom: none;} 
-.list5 .li .jsdinfo{padding-bottom: 20rpx;}
-.list5 .li:nth-last-child(2) .jsdinfo,.list5 .li:last-child .jsdinfo{padding-bottom: 10rpx;}
-/* 分隔线三 */
-.list6{padding: 20rpx;background: #fff;}
-.list6 .li{width: 237rpx;border-radius: 0;background-color: none;border-bottom: 2rpx solid #f4f1f4;border-right: 2rpx solid #f4f1f4;margin: 0;box-sizing: border-box;padding: 20rpx 10rpx 0;}
-.list6 .li:nth-child(3n){padding-right: 0;border-right: none;}
-.list6 .li:first-child,.list6 .li:nth-child(3n+1){padding-left: 0;}
-.list6 .li:first-child,.list6 .li:nth-child(2),.list6 .li:nth-child(3){padding-top: 0;}
-.list6 .li:nth-last-child(3),.list6 .li:nth-last-child(2),.list6 .li:last-child{border-bottom: none;}
-.list6 .li .jsdinfo{padding: 10rpx 10rpx 15rpx;}
-/* 无分隔线 */
-.list7{background: #fff;margin: 20rpx;border-radius: 12rpx;padding: 0 20rpx 15rpx;}
-.list7 .li{width: 210rpx;margin-right: 22rpx;}
-.list7 .li:nth-child(3n){margin-right: 0;}
-.list7 .li .jsdinfo{padding: 10rpx 0 15rpx;}
-
-/* yml  banner图 */
-.banner{margin-bottom: 20rpx; height: 300rpx;  overflow: hidden;position: relative;}
-.banner2{padding:0 20rpx; height: 300rpx;  overflow: hidden;position: relative;}
-.banner .swiper,.banner .swiper image{width: 100%;height: 300rpx; }
-.banner2 .swiper,.banner2 .swiper image{width: 100%;height: 300rpx; border-radius: 20rpx;}
-.dots{position: absolute;left: 0;right: 0;bottom:20rpx;align-items: center;justify-content: center;}
-.dot{background: #fff;width: 10rpx;height: 10rpx;border-radius: 5rpx;margin: 0 3rpx;}
-.dot.active{width: 30rpx;}
-
-.quan{margin: 0 20rpx;background: #FFEBEB;padding: 20rpx;border-radius: 8rpx;}
-.quan text{height: 45rpx;background: linear-gradient(90deg, #FE934C 0%, #FD3A31 100%);border-radius: 8rpx;font-size: 24rpx;color: #fff;padding: 0 14rpx;margin-right: 10rpx;line-height: 45rpx;font-weight: normal;}
-.rico{width: 12rpx;height: 21rpx;margin-left: 12rpx;}

pages/topic/topic.vue

@@ -1,373 +0,0 @@
-<template>
-	<!--pages/topic/topic.wxml-->
-	<!-- 顶部轮播图 -->
-	<view :style="'background-color:' + pageList.backgroundColor + ';'">
-		<view :class="' ' + (pageList.displayStyle == '2' ? 'banner2' : 'banner') + ' r20'" v-if="bannerList.length > 0">
-			<swiper class="swiper" @change="swiperChange" :current="swiperCurrent">
-				<block v-for="(item, index) in bannerList" :key="index">
-					<swiper-item autoplay="true">
-						<!-- <button open-type="contact" wx:if="{{item.type == 2}}">
-						<image src="{{item.pic + '?x-oss-process=style/w750-auto'}}" mode="aspectFit"></image>
-					</button>
-					<block wx:else> -->
-						<image lazy-load="true" :src="item.pic + '?x-oss-process=style/w750-auto'" mode="aspectFit" :data-type="item.type" :data-content="item.content"></image>
-						<!-- </block> -->
-					</swiper-item>
-				</block>
-			</swiper>
-			<view class="dots dflex">
-				<block v-for="(item, index) in bannerList" :key="index">
-					<view :class="'dot ' + (index == swiperCurrent ? ' active' : '')" :data-current="index" @tap="dotEvent"></view>
-				</block>
-			</view>
-		</view>
-		<view class="quan ddflex" @click="jumpUrl('/product/couponList/index?specialId='+productId)" v-if="couponList.length>0">
-			<view class="ddflex fflex">
-				<text v-for="(item,index) in couponList" :key="index">{{item.couponTitle}}</text>
-			</view>
-			<image src="../../static/pages/images/rico_red.png" class="rico"></image>
-		</view>
-
-		<!-- 商品列表 -->
-		<goods-list :pageList="pageList"></goods-list>
-
-		<!-- 分块版式一 -->
-		<!-- <view class="list1" wx:if="{{pageList.displayStyle=='2' && pageList.lineNumber=='1'}}">
-		<navigator url="/product/detail/detail?id={{item.id}}" hover-class="none" class="li dflex" wx:for="{{pageList.products}}" wx:key="index">
-			<view class="jsdimgs1">
-				<image src="{{item.pic+ '?x-oss-process=style/w750-auto'}}" mode="aspectFit" class="liimg"></image>
-				<image wx:if="{{item.isTimely}}" src="/pages/images/jishida.png" class="jsdimg1"></image>
-			</view>
-			<view class="info flex">
-				<view class="title">{{item.title}}</view>
-				<view class="infos">{{item.brief==null?' ':item.brief}}</view>
-				<view class="operate dflex">
-					<view class="price dflex">
-						￥ <text>{{item.salePrice}}</text>
-						<text class="del" wx:if="{{item.marketPrice!=0}}">￥{{item.marketPrice}}</text>
-					</view>
-					<view class="btn">立即抢购</view>
-				</view>
-			</view>
-		</navigator>
-	</view> -->
-		<!-- 分块版式二 -->
-		<!-- <view class="list2 dflex" wx:if="{{pageList.displayStyle=='2' && pageList.lineNumber=='2'}}">
-		<view class="li" wx:for="{{pageList.products}}" wx:key="index">
-			<navigator url="/product/detail/detail?id={{item.id}}" hover-class="none">
-				<view class="jsdimgs">
-					<image src="{{item.pic + '?x-oss-process=style/w375'}}" mode="aspectFit" class="jsdpro"></image>
-					<image wx:if="{{item.isTimely}}" src="/pages/images/jishida.png" class="jsdimg"></image>
-				</view>
-				<view class="jsdinfo">
-					<view class="proname">{{item.title}}</view>
-					<view class="operate dflex">
-						<view class="price proprice">￥<text>{{item.salePrice}}</text><text class="del" wx:if="{{item.marketPrice!=0}}">￥{{item.marketPrice}}</text>
-						</view>
-						<view class="add-cart">
-							<image src="/pages/images/jia.png"></image>
-						</view>
-					</view>
-				</view>
-			</navigator>
-		</view>
-	</view> -->
-		<!-- 分块版式三 -->
-		<!-- <view class="list3 dflex" wx:if="{{pageList.displayStyle=='2' && pageList.lineNumber=='3'}}">
-		<view class="li" wx:for="{{pageList.products}}" wx:key="index">
-			<navigator url="/product/detail/detail?id={{item.id}}" hover-class="none">
-				<view class="jsdimgs">
-					<image src="{{item.pic + '?x-oss-process=style/w210'}}" mode="aspectFit" class="jsdpro"></image>
-					<image wx:if="{{item.isTimely}}" src="/pages/images/jishida.png" class="jsdimg1"></image>
-				</view>
-				<view class="jsdinfo">
-					<view class="proname">{{item.title}}</view>
-					<view class="operate dflex">
-						<view class="price proprice">￥<text>{{item.salePrice}}</text></view>
-						<view class="add-cart">
-							<image src="/pages/images/jia.png"></image>
-						</view>
-					</view>
-				</view>
-			</navigator>
-		</view>
-	</view> -->
-		<!-- 分隔线版式一 -->
-		<!-- <view class="list1 list4" wx:if="{{pageList.displayStyle=='1' && pageList.lineNumber=='1'}}">
-		<navigator url="/product/detail/detail?id={{item.id}}" hover-class="none" class="li dflex" wx:for="{{pageList.products}}" wx:key="index">
-			<image src="{{item.pic+ '?x-oss-process=style/w750-auto'}}" mode="aspectFit" class="liimg"></image>
-			<image wx:if="{{item.isTimely}}" src="/pages/images/jishida.png" class="jsdimg1"></image>
-			<view class="info flex">
-				<view class="title">{{item.title}}</view>
-				<view class="infos">品质保证 全场五折</view>
-				<view class="operate dflex">
-					<view class="price dflex">
-						<text>￥</text>{{item.salePrice}}
-						<text class="del">¥{{item.marketPrice}}</text>
-					</view>
-					<view class="btn">立即抢购</view>
-				</view>
-			</view>
-		</navigator>
-	</view> -->
-
-		<!-- 分隔线版式二 -->
-		<!-- <view class="list2 list5 dflex" wx:if="{{pageList.displayStyle=='1' && pageList.lineNumber=='2'}}">
-		<view class="li" wx:for="{{pageList.products}}" wx:key="index">
-			<navigator url="/product/detail/detail?id={{item.id}}" hover-class="none">
-				<view class="jsdimgs">
-					<image src="{{item.pic + '?x-oss-process=style/w375'}}" mode="aspectFit" class="jsdpro"></image>
-					<image wx:if="{{item.isTimely}}" src="/pages/images/jishida.png" class="jsdimg1"></image>
-				</view>
-				<view class="jsdinfo">
-					<view class="proname">{{item.title}}</view>
-					<view class="operate dflex">
-						<view class="price proprice">￥<text>{{item.salePrice}}</text><text class="del">￥{{item.marketPrice}}</text>
-						</view>
-						<view class="add-cart">
-							<image src="/pages/images/jia.png"></image>
-						</view>
-					</view>
-				</view>
-			</navigator>
-		</view>
-	</view> -->
-		<!-- 分隔线版式三 -->
-		<!-- <view class="list3 list6 dflex" wx:if="{{pageList.displayStyle=='1' && pageList.lineNumber=='3'}}">
-		<view class="li" wx:for="{{pageList.products}}" wx:key="index">
-			<navigator url="/product/detail/detail?id={{item.id}}" hover-class="none">
-				<view class="jsdimgs">
-					<image src="{{item.pic + '?x-oss-process=style/w210'}}" mode="aspectFit" class="jsdpro"></image>
-					<image wx:if="{{item.isTimely}}" src="/pages/images/jishida.png" class="jsdimg1"></image>
-				</view>
-				<view class="jsdinfo">
-					<view class="proname">{{item.title}}</view>
-					<view class="operate dflex">
-						<view class="price proprice">￥<text>{{item.salePrice}}</text></view>
-						<view class="add-cart">
-							<image src="/pages/images/jia.png"></image>
-						</view>
-					</view>
-				</view>
-			</navigator>
-		</view>
-	</view> -->
-		<!-- 无分隔线版式 -->
-		<!-- <view class="list3 list7 dflex" wx:if="{{styletype==7}}">
-  <view class="li">
-    <view class="jsdimgs">
-      <image :src="picUrlss+'zbgw.png'" mode="aspectFit" class="jsdpro"></image>
-      <image src="/pages/images/jishida.png" class="jsdimg"></image>
-    </view>
-    <view class="jsdinfo">
-      <view class="proname">约斯夫儿童型医用退热贴约斯夫儿童型医用退热贴</view>
-      <view class="operate dflex">
-        <view class="price proprice">￥<text>129.00</text></view>
-        <view class="add-cart">
-          <image src="/pages/images/jia.png"></image>
-        </view>
-      </view>
-    </view>
-  </view>
-  <view class="li">
-    <view class="jsdimgs">
-      <image :src="picUrlss+'zbgw.png'" mode="aspectFit" class="jsdpro"></image>
-      <image src="/pages/images/jishida.png" class="jsdimg"></image>
-    </view>
-    <view class="jsdinfo">
-      <view class="proname">约斯夫儿童型医用退热贴约斯夫儿童型医用退热贴</view>
-      <view class="operate dflex">
-        <view class="price proprice">￥<text>129.00</text></view>
-        <view class="add-cart">
-          <image src="/pages/images/jia.png"></image>
-        </view>
-      </view>
-    </view>
-  </view>
-  <view class="li">
-    <view class="jsdimgs">
-      <image :src="picUrlss+'zbgw.png'" mode="aspectFit" class="jsdpro"></image>
-      <image src="/pages/images/jishida.png" class="jsdimg"></image>
-    </view>
-    <view class="jsdinfo">
-      <view class="proname">约斯夫儿童型医用退热贴约斯夫儿童型医用退热贴</view>
-      <view class="operate dflex">
-        <view class="price proprice">￥<text>129.00</text></view>
-        <view class="add-cart">
-          <image src="/pages/images/jia.png"></image>
-        </view>
-      </view>
-    </view>
-  </view>
-</view> -->
-	</view>
-</template>
-
-<script>
-// pages/topic/topic.js
-const app = getApp();
-const req = require('../../utils/request.js');
-import goodsList from '../../components/goodsList/goodsList';
-
-export default {
-	data() {
-		return {
-			picUrlss: req.public.picUrls,
-			page: 1,
-			pageList: {},
-			bannerList: [],
-			swiperCurrent: 0,
-			isLoad: true,
-			hasmore: true,
-			Title: '',
-			isRuleTrue: false,
-			//筛选是否显示
-			styletype: 0,
-			productId: 0 ,//专题id
-			options:'',
-			couponList: []
-		};
-	},
-
-	components: {
-		goodsList
-	},
-	props: {},
-
-	/**
-	 * 生命周期函数--监听页面加载
-	 */
-	onLoad: async function(options) {
-		this.options=options;
-		uni.showShareMenu({
-			menus: ['shareAppMessage']
-		});
-		// uni.setNavigationBarTitle({
-		// 	title: options.title ? options.title : '专题详情'
-		// });
-		this.setData({
-			productId: options.id
-		});
-		await this.getList(options.id);
-		await this.getCateCoupon();
-	},
-	onShareAppMessage() {
-		return{
-			title: this.options.title
-		}
-	},
-	methods: {
-		//产品分类优惠券
-		getCateCoupon(){
-			let form = {
-				page: 1,
-				limit: 3,
-				specialId: this.productId,
-				bindType: 'use'
-			}
-			return new Promise((resolve, reject) => {
-				req.getRequest('/api/coupon/list',form,data=>{
-					this.couponList = data;
-				})
-			})
-		},
-		//获取商品列表数据
-		getList(id) {
-			let that = this;
-			// console.log("isLoad", that.isLoad);
-
-			if (!that.isLoad) return false;
-			that.isLoad = false;
-			let form = {
-				id: id //searchTitle: that.data.searchTitle,
-				//sort: that.data.sort,
-				//attr: that.data.attr,
-				//categoryId: that.data.categoryId
-			};
-			let isShowLoading = false;
-			this.allShow = false;
-			if (!isShowLoading) {
-				req.loadIng('加载中');
-				isShowLoading = true;
-			}
-			return new Promise((resolve,reject)=>{
-				req.getRequest('/api/special/detail', form, data => {
-					// console.log("pageList:", data);
-					uni.setNavigationBarTitle({
-						title: data.title ? data.title : '专题详情'
-					});
-					if (data && data.length >= 10) that.isLoad = true;
-					if (that.page > 1) data = that.pageList.concat(data);
-
-					if (data) {
-						data.products = data.products.map(it => {
-							if (it.deliverWay && JSON.parse(it.deliverWay).indexOf(3) != -1) it.isJs = true;
-							return it;
-						});
-						// console.log(data)
-						that.getBanner(data.bannerGroupId);
-						that.setData({
-							pageList: data
-						});
-					}
-					if (isShowLoading) {
-						uni.hideLoading();
-						isShowLoading = false;
-					}
-					resolve();
-				});
-			})
-			req.postRequest(
-				'/api/browse',
-				{
-					bindId: id,
-					type: 3
-				},
-				data => {
-					// console.log("api/browse", data);
-				}
-			);
-		},
-
-		//获取banner图数据
-		getBanner(groupId) {
-			let that = this;
-			req.getRequest(
-				'/api/banner',
-				{
-					groupId: groupId
-				},
-				data => {
-					// console.log("banner图数据", data);
-					if (data && data.length >= 10) that.isLoad = true;
-					if (that.page > 1) data = that.pageList.concat(data);
-
-					if (data && data.length > 0) {
-						that.setData({
-							bannerList: data
-						});
-					}
-				}
-			);
-		},
-
-		/**
-		 * 轮播切换
-		 */
-		swiperChange({ detail }) {
-			if (detail.source !== 'touch') return;
-			this.setData({
-				swiperCurrent: detail.current
-			});
-		},
-		jumpUrl(url){
-			uni.navigateTo({
-				url: url
-			})
-		}
-	}
-};
-</script>
-<style>
-@import './topic.css';
-</style>

pages/topiclist/topiclist.css

@@ -1,18 +0,0 @@
-/* pages/topicList/topiclist.wxss */
-
-.ztdiv{height: 310rpx;
-  background-color: #fff;
-  margin-top: 20rpx;
-  padding: 0rpx 0rpx 20rpx 0rpx;
-  margin-left: 20rpx;
-  margin-right: 20rpx;
-  border-radius: 20rpx;
-  
-  }
-.imgdiv{width: 100%;
-  height: 240rpx;
-  }
-.t-img{height:240rpx;width: 710rpx;border-radius: 20rpx 20rpx 0 0;}
-
-.txtdiv{padding-left: 20rpx;padding-top: 20rpx; border-top: 1rpx #eee solid;
-}

pages/topiclist/topiclist.vue

@@ -1,110 +0,0 @@
-<template>
-<view class="main">
-
-    <navigator v-for="(item, index) in pageList" :key="index" :url="'/pages/topic/topic?id=' + item.id" hover-class="none" class="li dflex">
-      <view class="ztdiv">
-        <view class="imgdiv">
-          <image :src="item.pic+ '?x-oss-process=style/w750-auto'" class="t-img"></image>
-        </view>
-        <view class="txtdiv">
-            <text>{{item.title}}</text>
-        </view>
-       </view>
-    </navigator>
-
-</view>
-</template>
-
-<script>
-// pages/topicList/topiclist.js
-// pages/topic/topic.js
-const app = getApp();
-const req = require("../../utils/request.js");
-
-export default {
-  data() {
-    return {
-      page: 1,
-      pageList: [],
-      bannerList: [],
-      swiperCurrent: 0,
-      isLoad: true,
-      hasmore: true,
-      isRuleTrue: false,
-      //筛选是否显示
-      styletype: 0
-    };
-  },
-
-  components: {},
-  props: {},
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    this.getList();
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {},
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {},
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {},
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {},
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {},
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {},
-  methods: {
-    getList() {
-      let that = this;
-      // console.log(that.isLoad);
-      if (!that.isLoad) return false;
-      that.isLoad = false;
-      let form = {
-        page: 1,
-        limit: 10 //searchTitle: that.data.searchTitle,
-        //sort: that.data.sort,
-        //attr: that.data.attr,
-        //categoryId: that.data.categoryId
-
-      };
-      req.getRequest('/api/special/list', form, data => {
-        // console.log(data);
-        if (data && data.length >= 10) that.isLoad = true;
-        if (that.page > 1) data = that.pageList.concat(data);
-
-        if (data) {
-          that.setData({
-            pageList: data
-          });
-        }
-      });
-    }
-
-  }
-};
-</script>
-<style>
-@import "./topiclist.css";
-</style>