Merge branch 'youmengting-dev' of http://gitea.dctpay.com/yangjie/high-mini into new-dev

pages.json

@@ -1080,10 +1080,9 @@
 				}
 
 			}]
-	},{
+		}, {
-		"root":"physical-merchants",
+			"root": "physical-merchants",
-		"pages":[
+			"pages": [{
-			{
 					"path": "classify/goodsDetail/goodsDetail",
 					"style": {
 						"navigationBarTitleText": "商品详情",
@@ -1213,12 +1212,12 @@
 				"selectedIconPath": "static/img/tabBar/home-on.png",
 				"text": "首页"
 			},
-			{
+			// {
-					"pagePath": "pages/tabBar/classify/classify",
+			// 		"pagePath": "pages/tabBar/classify/classify",
-					"iconPath": "static/img/tabBar/cart.png",
+			// 		"iconPath": "static/img/tabBar/cart.png",
-					"selectedIconPath": "static/img/tabBar/cart-on.png",
+			// 		"selectedIconPath": "static/img/tabBar/cart-on.png",
-					"text": "商品"
+			// 		"text": "商品"
-				},
+			// 	},
 			{
 				"pagePath": "pages/tabBar/category/category",
 				"iconPath": "static/img/tabBar/category.png",
@@ -1234,7 +1233,7 @@
 			}
 		]
 	},
-	"condition" : { //模式配置，仅开发期间生效
+	"condition": { //模式配置，仅开发期间生效
 		// "current": 0, //当前激活的模式(list 的索引项)
 		// "list": [
 		// 	{

pages/tabBar/category/category.vue

@@ -229,14 +229,40 @@
 				imgadres3: 'noorder.png',
 				imgadres4: 'dh.png',
 				marker: '', //商户
-				typeid: 0, //选择分类
+				typeid: 99999999, //选择分类
 				isSelected: 1, //是否选择下拉
-				selectFirst: '', //筛选是否有值
+				selectFirst: '99999999', //筛选是否有值
-				selectFirstName: '', //筛选值名字
+				selectFirstName: '全部', //筛选值名字
 				selectChiler: 2, // 一级子菜单筛选
 				selectChilerdistance: 2, // 二级子菜单筛选
-				goodsFirstClassList: '', //商品一级分类
+				goodsFirstClassList: [{
-				goodsSendotClassList: '', //商品一级分类
+					"childIndustry": null,
+					"createTime": 1640252815000,
+					"name": "全部",
+					"id": 99999999,
+					"wechatCompanyCode": "716",
+					"wechatName": "全部",
+					"ext3": null,
+					"parentId": 1,
+					"wechatSelfEmployedCode": "719",
+					"ext2": null,
+					"status": 1,
+					"ext1": "650"
+				}], //商品一级分类
+				goodsSendotClassList: [{
+					"childIndustry": null,
+					"createTime": 1640252998000,
+					"name": "全部",
+					"id": 99999999,
+					"wechatCompanyCode": "716",
+					"wechatName": "全部",
+					"ext3": null,
+					"parentId": 13,
+					"wechatSelfEmployedCode": "719",
+					"ext2": null,
+					"status": 1,
+					"ext1": "642"
+				}], //商品一级分类
 				distanceList: [{
 						id: 1,
 						title: '1km'
@@ -292,17 +318,19 @@
 			getIndustry() {
 				getIndustry().then(res => {
 					if (res.return_code == '000000') {
-						this.goodsFirstClassList = res.return_data;
+						for (var i = 0; i < res.return_data.length; i++) {
-						this.typeid = res.return_data[0].id;
+							this.goodsFirstClassList.push(res.return_data[i]);
-						this.goodsSendotClassList = res.return_data[0].childIndustry;
+						}
-						this.selectFirst = res.return_data[0].childIndustry[0].id;
+						// this.typeid = res.return_data[0].id;
-						this.selectFirstName = res.return_data[0].childIndustry[0].name;
+						// this.goodsSendotClassList = res.return_data[0].childIndustry;
+						// this.selectFirst = res.return_data[0].childIndustry[0].id;
+						// this.selectFirstName = res.return_data[0].childIndustry[0].name;
 						let platform = uni.getSystemInfoSync().platform;
 						if (platform == 'android') {
 							this.typeplat = 2;
 							this.getMapStore();
 						}
-						if (platform == 'ios') {
+						if (platform == 'ios' || platform == 'devtools') {
 							this.typeplat = 1;
 							this.getMapStore();
 						}
@@ -311,11 +339,17 @@
 			},
 			//查询商户
 			getMapStore() {
+				let childId = '';
+				if (this.selectFirst == 99999999) {
+					childId = '';
+				} else {
+					childId = this.selectFirst
+				}
 				let datas = {
 					distance: this.distance,
 					name: this.searchName,
 					type: this.typeplat,
-					childId: this.selectFirst,
+					childId: childId,
 					longitude: this.longitude,
 					latitude: this.latitude
 				}
@@ -482,7 +516,7 @@
 					type: 'wgs84',
 					success: (res) => {
 						uni.hideLoading();
-						console.log(res, '获取当前位置')
+						// console.log(res, '获取当前位置')
 						this.longitude = res.longitude;
 						this.latitude = res.latitude;
 						this.getIndustry();
@@ -498,9 +532,29 @@
 			//选择类型
 			changeType(item) {
 				this.typeid = item.id;
+				if (item.id == 99999999) {
+					this.goodsSendotClassList = [{
+						"childIndustry": null,
+						"createTime": 1640252998000,
+						"name": "全部",
+						"id": 99999999,
+						"wechatCompanyCode": "716",
+						"wechatName": "全部",
+						"ext3": null,
+						"parentId": 13,
+						"wechatSelfEmployedCode": "719",
+						"ext2": null,
+						"status": 1,
+						"ext1": "642"
+					}];
+					this.selectFirst = '99999999';
+					this.selectFirstName = '全部';
+				}else{
 					this.goodsSendotClassList = item.childIndustry;
 					this.selectFirst = item.childIndustry[0].id;
 					this.selectFirstName = item.childIndustry[0].name;
+				}
+				
 				this.getMapStore();
 			},
 			//子菜单显示

pages/tabBar/home/home.vue

@@ -137,6 +137,16 @@
 					<view class="width94 fcoreb5 font15 fontwig6">¥{{goods.price}}</view>
 				</view>
 			</view>
+			<!-- 大图 -->
+			<view class="width90 mart20 alijusstart" v-if="item.type == 4"
+				@click="goGoodsList(item.jumpUrl)">
+				<view class="width70 font18 fcor333">
+					{{item.name}}
+				</view>
+			</view>
+			<image class="width90 mart10" mode="widthFix" v-if="item.type == 4"
+				:src="imageUrl+item.childCategory[0].imgData" @click="goGoodsList(item.childCategory[0].jumpUrl)">
+			</image>
 			<!-- 惠享生活 -->
 			<view class="width90 mart20 alijusstart" v-if="item.type == 5">
 				<view class="width70 font18 fcor333">

physical-merchants/classify/cart/cart.vue

@@ -498,7 +498,7 @@
 
 			},
 			goClassify(){
-				uni.switchTab({
+				uni.reLaunch({
 					url:'/pages/tabBar/classify/classify'
 				})
 			},

physical-merchants/settleAccounts/detail-popup/detail-popup.vue

@@ -157,21 +157,24 @@
 								{{item.discountName}}
 							</view>
 							<view class="font13 mart5 fcor666">
-								截止时间:{{item.useEndTime | formatDate }}
+								截止时间:{{item.useEndTime | formatDate }} <text class="fcorred paddleft5" v-if="item.useEndTime<(new Date()).getTime()">已过期</text>
+								
 							</view>
 						</view>
-						<view class=""  v-if="item.discountCondition<=totalPrice">
+						<!-- 截止时间:{{item.useEndTime}}-- {{(new Date()).getTime() }} -->
-							
+						<view class=""  v-if="(item.discountCondition<=totalPrice)&&(item.useEndTime>(new Date()).getTime())&&totalPrice!=0">
 								<radio  class="radio-ca" :checked="yhqType == item.id" :value="item.id+''" color="#FF1A34" />
-							
 						</view>
 					</view>
+					
+					<template v-if="(item.useEndTime>(new Date()).getTime())">
 						<view v-if="item.discountCondition>totalPrice&&item.discountType == 1"  class="paddtop10  mart10 border-t font14">
 							<view class="fotred  fontwig6 ">不可用原因</view> 
 							<view class="fcor666">
 								使用门槛为{{item.discountCondition}}元，还差{{ parseFloat((item.discountCondition-totalPrice).toFixed(2)) }}元才能使用
 							</view>
 						</view>
+					</template>
 				</view>
 				
 			</radio-group>