首页功能完成

api/index/index.js

@@ -4,5 +4,5 @@ const {
 } = uni.$u
 
 
-//测试接口
-export const getValidateCode = (params, config = {}) => http.post('/api/api/v1/common/send', params, config)
+//获取活动商品
+export const getActGoodsReq = (params, config = {}) => http.get('/api/getActivityData', params, config)

api/test/index.js

@@ -130,9 +130,4 @@ export const addCollReq = (params, config = {}) => http.post('/api/users/addColl
 
 
 // 取消收藏
-export const cancelCollReq = (params, config = {}) => http.post('/api/users/cancelCollect', params, config)
-
-
-
-//获取活动商品
-export const getActGoodsReq = (params, config = {}) => http.get('/api/getActivityData', params, config)
+export const cancelCollReq = (params, config = {}) => http.post('/api/users/cancelCollect', params, config)

components/navBar/index.scss

@@ -14,22 +14,23 @@
 				width: 100%;
 				// padding-bottom: 10rpx;
 				.narbar-content {
-					// height: 45px;
-					padding: 0 30px;
-					// margin-bottom: 10px;
+					padding: 0 40rpx;
 					display: flex;
 					box-sizing: border-box;
-					justify-content:center;
+					// justify-content:center;
 					align-items: center;
 					.left{
-						position: absolute;
-						left: 5%;
+						// position: absolute;
+						// left: 5%;
 						font-weight: 600;
+						display: flex;
+						align-items: center;
 					}
 					.title{
 						font-size: 16px;
 						color: #fff;
 						font-weight: 600;
+						// line-height: 40px;
 					}
 					
 				}

components/navBar/index.vue

@@ -7,7 +7,11 @@
 				<!-- 左侧返回按钮 -->
 				<view class="left" @click="onBack" v-if="back" :style="[{color},{paddingTop}]">
 					<uni-icons type="arrowleft" size="25" :color='color'></uni-icons>
-					<!-- <u--image :showLoading="true" src="https://bsl-lj-rent.oss-cn-shanghai.aliyuncs.com/idn-mac/indexs/lianxi.png" width="60rpx" height="71rpx" @click="click"></u--image> -->
+				</view>
+				<view class="left" @click="" v-else>
+					<image :showLoading="true" src="@/static/index/logo.png"
+						style="width:40rpx;height:40rpx;margin-right: 8rpx;" @click="">
+					</image>
 				</view>
 				<view class="title" :style="[{color}]">
 					{{title}}

components/privacyPopup/index.vue

@@ -32,7 +32,11 @@
 		},
 		methods: {
 			openPrivacyContract() {
-				uni.openPrivacyContract({});
+				wx.openPrivacyContract({
+					// success: () => {}, // 打开成功
+					// fail: () => {}, // 打开失败
+					// complete() => {}
+				});
 			},
 			handleAgreePrivacyAuthorization() {
 				getApp().globalData.showPrivacy = false;

manifest.json

@@ -1,66 +1,66 @@
 {
-	"name": "jiancaiPro",
-	"appid": "__UNI__C046D51",
-	"description": "",
-	"versionName": "1.0.0",
-	"versionCode": "100",
-	"transformPx": false,
-	"app-plus": {
-		/* 5+App特有相关 */
-		"usingComponents": true,
-		"nvueCompiler": "uni-app",
-		"nvueStyleCompiler": "uni-app",
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		"modules": {},
-		/* 模块配置 */
-		"distribute": {
-			/* 应用发布信息 */
-			"android": {
-				/* android打包配置 */
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				]
-			},
-			"ios": {},
-			/* ios打包配置 */
-			"sdkConfigs": {}
-		}
-	},
-	/* SDK配置 */
-	"quickapp": {},
-	/* 快应用特有相关 */
-	"mp-weixin": {
-		"appid": "wx98ab2939999e13de",
-		"setting": {
-			"urlCheck": false
-		},
-		"usingComponents": true,
-		"permission": {
-			"scope.userLocation": {
-				"desc": "用于小程序使用中为您提供位置信息"
-			}
-		},
-		"requiredPrivateInfos": ["getLocation", "choosePoi", "chooseAddress", "chooseLocation"]
-		// "__usePrivacyCheck__": true
-	},
-	"vueVersion": "2"
-}
+    "name" : "jiancaiPro",
+    "appid" : "__UNI__C046D51",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    "app-plus" : {
+        /* 5+App特有相关 */
+        "usingComponents" : true,
+        "nvueCompiler" : "uni-app",
+        "nvueStyleCompiler" : "uni-app",
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "modules" : {},
+        /* 模块配置 */
+        "distribute" : {
+            /* 应用发布信息 */
+            "android" : {
+                /* android打包配置 */
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            "ios" : {},
+            /* ios打包配置 */
+            "sdkConfigs" : {}
+        }
+    },
+    /* SDK配置 */
+    "quickapp" : {},
+    /* 快应用特有相关 */
+    "mp-weixin" : {
+        "appid" : "wx98ab2939999e13de",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true,
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "用于小程序使用中为您提供位置信息"
+            }
+        },
+        "requiredPrivateInfos" : [ "getLocation", "choosePoi", "chooseAddress", "chooseLocation" ]
+    },
+    // "__usePrivacyCheck__": true
+    "vueVersion" : "2"
+}

pages.json

@@ -13,7 +13,7 @@
 			}
 		},
 		{
-			"path": "pages/category/index",
+			"path": "pages/mall/index",
 			"style": {
 				"navigationBarTitleText": "分类"
 			}
@@ -56,7 +56,7 @@
 		}
 	],
 	"globalStyle": {
-		"navigationBarTextStyle": "white",
+		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8",
@@ -67,11 +67,11 @@
 	},
 
 	"tabBar": {
-		"color": "black", //字体颜色
-		"selectedColor": "#1afa29", //选中时字体颜色
+		"color": "#CBC8C7", //字体颜色
+		"selectedColor": "#F7790C", //选中时字体颜色
 		"borderStyle": "black", //底部的上边框线条
 		"backgroundColor": "#F8F8F8", //底部背景色
-		"fontSize": "12px", //字体大小
+		"fontSize": "22rpx", //字体大小
 		"spacing": "5px", //字体到图标的距离
 		"height": "50px", //底部高
 
@@ -100,10 +100,10 @@
 				}
 			},
 			{
-				"pagePath": "pages/category/index",
-				"text": "分类",
-				"iconPath": "static/tabbar/cat.png",
-				"selectedIconPath": "static/tabbar/cat_a.png",
+				"pagePath": "pages/mall/index",
+				"text": "商城",
+				"iconPath": "static/tabbar/mall.png",
+				"selectedIconPath": "static/tabbar/mall_a.png",
 				"iconfont": {
 					"text": "\ue750", //  这是图标原始的编码
 					"selectedText": "\ue750", //
@@ -114,7 +114,7 @@
 			},
 			{
 				"pagePath": "pages/service/index",
-				"text": "售后",
+				"text": "服务",
 				"iconPath": "static/tabbar/service.png",
 				"selectedIconPath": "static/tabbar/service_a.png",
 				"iconfont": {

pages/index/index.scss

@@ -0,0 +1,275 @@
+// .swiper{
+// 	}
+// 自定义指示器样式
+
+::v-deep .u-swiper{
+	border-radius: 0!important;
+}
+::v-deep .u-line{
+	 width: 56rpx!important;
+ }
+ 
+ .container{
+	 padding-bottom: 62rpx;
+ }
+.swiperAndBook{
+	position: relative;
+	.tab{
+		position: absolute;
+		z-index: 9;
+		height: 92rpx;
+		display: flex;
+		align-items: center;
+		color: #D8D6D4;
+		padding-left: 40rpx;
+		background: rgba(0, 0, 0,.19);
+		width: 100%;
+		.item{
+			margin-right: 52rpx;
+			font-size: 32rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: 400;
+		}
+		.itemA{
+			font-size: 36rpx;
+			font-family: PingFang-SC-Bold, PingFang-SC;
+			font-weight: bold;
+			color: #FFFFFF;
+		}
+	}
+	
+	.bottomBtn{
+		.bookingAndIndicator{
+			background: black;
+			height: 228rpx;
+			display: flex;
+			justify-content: center;
+			flex-direction: column;
+			align-items: center;
+			padding-top: 92rpx;
+			box-sizing: border-box;
+			.btn{
+				width: 362rpx;
+				height: 76rpx;
+				border-radius: 38rpx;
+				border: 2rpx solid #FFFFFF;
+				
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				
+				.btnTxt{
+					width: 112rpx;
+					height: 28rpx;
+					font-size: 28rpx;
+					font-family: PingFangSC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #FFFFFF;
+					line-height: 28rpx;
+					margin-right: 12rpx;
+				}
+			}
+			
+			.indicatorBox{
+				position: relative;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				margin-top: 32rpx;
+				margin-bottom: 34rpx;
+				.indicator {
+				       @include flex(row);
+				       justify-content: center;
+						position: absolute;
+						top: 10rpx;
+				       &__dot {
+							width: 81rpx;
+							height: 2rpx;
+				            margin: 0 8rpx;
+				            transition: background-color 0.3s;				 
+							 width: 24rpx;
+							 height: 4rpx;
+							 background: #6A6A6A;
+							 border-radius: 10rpx;
+				           &--active {
+				                background-color:#ECECEC;
+								width: 60rpx;
+				            }
+				       }
+				   }
+				   .indicator-num {
+				       padding: 2px 0;
+				       background-color: rgba(0, 0, 0, 0.35);
+				       border-radius: 100px;
+				       width: 35px;
+				       @include flex;
+				       justify-content: center;
+				
+				       &__text {
+				            color: #FFFFFF;
+				            font-size: 12px;
+				        }
+				   }
+			}
+		}
+	}
+}
+.bg{
+	// background:url('https://oaigc.oss-cn-chengdu.aliyuncs.com/lamp/2023-09/2023090615382538343.png') no-repeat;
+	// background-image: url('@/static/index/bg.png');
+	background-size: 100% 100%;
+	.controlPart{
+		padding: 0 32rpx;
+		.top{
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			height: 112rpx;
+			.left{
+				display: flex;
+				justify-content: flex-start;
+				align-items: flex-start;
+				flex-direction: column;
+				image{
+					margin-bottom: -20rpx;
+					margin-left: -20rpx;
+				}
+				.title{
+					font-size: 36rpx;
+					font-family: PingFang-SC-Bold, PingFang-SC;
+					font-weight: bold;
+					color: #333333;
+				}
+			}
+			image{
+				
+			}
+		}
+		.con{
+			width: 100%;
+			image{
+				width: 100%;
+				height: 452rpx;
+				border-radius: 0 25rpx 0 25rpx;
+			}
+		}
+	}
+	
+	.productLead{
+		padding-left: 30rpx;
+		.top{
+			display: flex;
+			align-items: flex-end;
+			justify-content: space-between;
+			height: 184rpx;
+			padding-right: 32rpx;
+			padding-bottom: 42rpx;
+			box-sizing: border-box;
+			.left{
+				position: relative;
+				.bottomEng{
+					font-size: 44rpx;
+					font-family: PingFang-SC-Bold, PingFang-SC;
+					font-weight: bold;
+					color:#E1DDDB;
+					position: absolute;
+					z-index: 1;
+					min-width: 568rpx;
+					top:-35rpx;
+					// letter-spacing: 10rpx;
+				}
+				.bt{
+					display: flex;
+					align-items: center;
+					position: relative;
+					z-index: 2;
+					.title{
+						font-size: 32rpx;
+						font-family: PingFang-SC-Bold, PingFang-SC;
+						font-weight: bold;
+						color: #333333;
+						margin-right: 6rpx;
+					}
+				}
+				
+			}
+		}
+		.con{
+			// width: calc(100% - 30rpx);
+			width:100%;
+			display: flex;
+			overflow-x: scroll;
+			.item{
+				width: 336rpx;
+				// height: 368rpx;
+				background: #FFFFFF;
+				border-radius: 24rpx;
+				border: 2rpx solid #F1F1F1;
+				margin-right: 16rpx;
+				image{
+					width: 336rpx;
+					height: 292rpx;
+					border-radius: 30rpx 30rpx 0 0;
+				}
+				.bottom{
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					height: 76rpx;
+				}
+			}	
+		}
+		
+		.conLast{
+			margin-bottom: 90rpx;
+			
+			.indicatorBox1{
+							position: relative;
+							display: flex;
+							justify-content: center;
+							align-items: center;
+							margin-top: 32rpx;
+							margin-bottom: 34rpx;
+							.indicator1 {
+							       @include flex(row);
+							       justify-content: center;
+									position: absolute;
+									top: 10rpx;
+							       &__dot1 {
+										width: 24rpx;
+										height: 8rpx;
+										border-radius: 4rpx;
+							            margin: 0 8rpx;
+							            transition: background-color 0.3s;				 
+										 background: #D4D4D4;
+										 // border-radius: 10rpx;
+							           &--active1 {
+							                background-color:#E77817;
+											width: 60rpx;
+							            }
+							       }
+							   }
+							   .indicator-num1 {
+							       padding: 2px 0;
+							       background-color: blue;
+							       border-radius: 100px;
+							       width: 35px;
+							       @include flex;
+							       justify-content: center;
+							
+							       &__text1 {
+							            color: red;
+							            font-size: 12px;
+							        }
+							   }
+						}
+		}
+	}
+}
+
+
+
+
+
+
+

pages/index/index.vue

@@ -1,71 +1,187 @@
 <template>
 	<view class="container">
-		<navBar title="首页" :back="false" color="white" background="green" />
-		<u-button text="测试网络请求" @click="testReq" type="primary"></u-button>
-		<u-button text="测试vuex仓库" @click="testStore" type="primary"></u-button>
-		<u-button text="测试登录-vuex仓库" @click="testLogin" type="primary"></u-button>
-		<u-button text="测试登录退出登录" @click="testLogout" type="primary"></u-button>
+		<navBar title="GIGESI 吉格斯" :back="false" color="#333333" background="#FFFFFF" />
 
+		<!-- 轮播和订购区 -->
+		<view class="swiperAndBook">
+			<view class="tab">
+				<view class="item" v-for="(item,index) in tabList" :class="[currTabIndex==index?'itemA':'']"
+					@click="currTabIndex=index">
+					{{item}}
+				</view>
+			</view>
+			<view class="bottomBtn">
+				<u-swiper type='img' class="swiper" :list="bannerList" keyName="img_url" indicator indicatorMode="line"
+					:autoplay="false" height="996rpx" imgMode="scaleToFill" circular
+					@change="e => currentNum = e.current">
+					<view slot="indicator">
+					</view>
+				</u-swiper>
+
+				<view class="bookingAndIndicator">
+					<view class="btn">
+						<text class="btnTxt">立即订购</text>
+						<image src="@/static/index/halfRight.png" mode="" style="width: 24rpx;height: 8rpx;"></image>
+					</view>
+					<view class="indicatorBox">
+						<view class="indicator">
+							<view class="indicator__dot" style="" v-for="(item, index) in bannerList" :key="index"
+								:class="[index === currentNum ?'indicator__dot--active':'']">
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="bg" style="">
+			<view class="controlPart">
+				<view class="top">
+					<view class="left">
+						<image src="/static/index/part1_icon.png" mode="" style="width: 56rpx;height: 28rpx;"></image>
+						<view class="title">
+							智能控制系统
+						</view>
+					</view>
+					<image src="/static/index/more.png" mode="" style="width: 48rpx;height: 48rpx;"></image>
+				</view>
+				<view class="con">
+					<image src="/static/index/img1.png" mode=""></image>
+				</view>
+			</view>
+
+			<view class="controlPart">
+				<view class="top">
+					<view class="left">
+						<image src="/static/index/part1_icon.png" mode="" style="width: 56rpx;height: 28rpx;"></image>
+						<view class="title">
+							网络规划-全屋WiFi
+						</view>
+					</view>
+					<image src="/static/index/more.png" mode="" style="width: 48rpx;height: 48rpx;"></image>
+				</view>
+				<view class="con">
+					<image src="/static/index/img1.png" mode=""></image>
+				</view>
+			</view>
 
-		<u-button text="测试提示弹框" @click="$toast('测试','success')" type="primary"></u-button>
-		<u-button text="测试自定义弹框" @click="show=true" type="primary"></u-button>
+			<!-- 产品指南 -->
+			<view class="productLead">
+				<view class="top">
+					<view class="left">
+						<view class="bottomEng">
+							PRODUCT GUIDE
+						</view>
+						<view class="bt">
+							<view class="title">
+								产品指南
+							</view>
+							<image src="/static/index/zhinan.png" mode="" style="width: 32rpx;height: 32rpx;"></image>
+						</view>
+					</view>
+					<image src="/static/index/more.png" mode="" style="width: 48rpx;height: 48rpx;"></image>
+				</view>
+				<view class="con">
+					<view class="item" v-for="i in 3">
+						<image src="/static/index/img1.png" mode=""></image>
+						<view class="bottom">
+							灯具指南
+						</view>
+					</view>
+				</view>
+			</view>
 
 
-		<dpopup :show="show" mode="bottom" :round="10" @close="show=false">
-			<view slot="content">
+			<!-- 展厅地址 -->
+			<view class="productLead">
 				<view class="top">
-					顶部
+					<view class="left">
+						<view class="bottomEng">
+							ADDRESS
+						</view>
+						<view class="bt">
+							<view class="title">
+								展厅地址
+							</view>
+							<image src="/static/index/addr.png" mode="" style="width: 26rpx;height: 36rpx;"></image>
+						</view>
+					</view>
+					<image src="/static/index/more.png" mode="" style="width: 48rpx;height: 48rpx;"></image>
 				</view>
-				<view class="content" style="height: 300px;">
-					内容
+				<view class="conLast">
+
+					<u-swiper type='def' class="swiper" :defList="bannerList1" keyName="img_url" indicator
+						indicatorMode="line" :autoplay="false" previousMargin="30" nextMargin="30" height="490rpx"
+						radius="40rpx" imgMode="scaleToFill" bgColor="rgba(255,255,255,0)" circular
+						@change="e => currentNum1 = e.current" @click1="jumpLink">
+						<view slot="indicator">
+						</view>
+						<view slot="defCon">
+						</view>
+					</u-swiper>
+					<!-- 自定义轮播图指示器 -->
+					<view class="indicatorBox1">
+						<view class="indicator1">
+							<view class="indicator1__dot1" style="" v-for="(item, index) in bannerList1" :key="index"
+								:class="[index === currentNum1 ?'indicator1__dot1--active1':'']">
+							</view>
+						</view>
+					</view>
 				</view>
 			</view>
-		</dpopup>
+
+
+			<u-loadmore style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
+		</view>
 	</view>
 </template>
 
 <script>
 	import {
-		getValidateCode
+		getActGoodsReq
 	} from '@/api/index/index.js'
 	export default {
 		data() {
 			return {
-				show: false
+				bannerList: [
+					require('@/static/index/main.png'),
+					require('@/static/index/main.png'),
+					require('@/static/index/main.png')
+					// 'https://img1.baidu.com/it/u=1890390320,3399874998&fm=253&fmt=auto&app=120&f=JPEG?w=1422&h=800',
+					// 'https://cdn.uviewui.com/uview/swiper/swiper3.png',
+					// 'https://cdn.uviewui.com/uview/swiper/swiper2.png',
+					// 'https://cdn.uviewui.com/uview/swiper/swiper1.png',
+				],
+				bannerList1: [{
+						name: '大众',
+						phone: '15611111111',
+						addrName: '地址1',
+						addrInfo: '四川省成都市XX区XX路XX号'
+					},
+					{
+						name: '崩腾',
+						phone: '15622222222',
+						addrName: '地址1',
+						addrInfo: '四川省成都市XX区XX路XX号'
+					},
+					{
+						name: '宝马',
+						phone: '15633333333',
+						addrName: '地址1',
+						addrInfo: '四川省成都市XX区XX路XX号'
+					}
+				],
+				currentNum: 0,
+				currentNum1: 0,
+
+				tabList: ['无主灯', '主灯', '吸顶灯'],
+				currTabIndex: 0,
 			}
 		},
 		methods: {
 			async testReq() {
-
-				console.log('testStore()111111', this.$store.getters['user/testInfo']);
-				console.log('testStore()111111', this.$store.getters['user/testInfo2']);
-				let res = await getValidateCode({
-					phone: '15609038521',
-					event: 'register'
-				})
-				uni.showToast({
-					title: res.msg,
-					icon: 'none'
-				})
-				console.log('发送短信验证码返回值', res);
-				// if (res.code == 0) {}
-			},
-			testStore() {
-				this.$store.dispatch('user/testAct', '6666666')
-				console.log('testStore()', this.$store.getters['user/testInfo']);
-				// this.$store.dispatch('testAct', '66666');
-				// console.log('存入仓库后', this.$store.getters.testInfo);
-			},
-			async testLogin() {
-				let res = await this.$store.dispatch('user/testAct2', {
-					phone: '15609038533',
-					event: 'register'
-				})
-				console.log('测试登录返回值：', res);
-			},
-			testLogout() {
-				this.$store.dispatch('user/testAct3')
-				console.log('测试退出登录返回值：', this.$store.getters['user/testInfo3']);
+				let res = await getActGoodsReq()
+				this.$toast(res.msg)
+				console.log('返回值', res);
 			},
 		}
 	}

pages/index/index1.vue

@@ -0,0 +1,75 @@
+<template>
+	<view class="container">
+		<navBar title="首页" :back="false" color="white" background="green" />
+		<u-button text="测试网络请求" @click="testReq" type="primary"></u-button>
+		<u-button text="测试vuex仓库" @click="testStore" type="primary"></u-button>
+		<u-button text="测试登录-vuex仓库" @click="testLogin" type="primary"></u-button>
+		<u-button text="测试登录退出登录" @click="testLogout" type="primary"></u-button>
+
+
+		<u-button text="测试提示弹框" @click="$toast('测试','success')" type="primary"></u-button>
+		<u-button text="测试自定义弹框" @click="show=true" type="primary"></u-button>
+
+
+		<dpopup :show="show" mode="bottom" :round="10" @close="show=false">
+			<view slot="content">
+				<view class="top">
+					顶部
+				</view>
+				<view class="content" style="height: 300px;">
+					内容
+				</view>
+			</view>
+		</dpopup>
+	</view>
+</template>
+
+<script>
+	import {
+		getValidateCode
+	} from '@/api/index/index.js'
+	export default {
+		data() {
+			return {
+				show: false
+			}
+		},
+		methods: {
+			async testReq() {
+				console.log('testStore()111111', this.$store.getters['user/testInfo']);
+				console.log('testStore()111111', this.$store.getters['user/testInfo2']);
+				let res = await getValidateCode({
+					phone: '15609038521',
+					event: 'register'
+				})
+				uni.showToast({
+					title: res.msg,
+					icon: 'none'
+				})
+				console.log('发送短信验证码返回值', res);
+				// if (res.code == 0) {}
+			},
+			testStore() {
+				this.$store.dispatch('user/testAct', '6666666')
+				console.log('testStore()', this.$store.getters['user/testInfo']);
+				// this.$store.dispatch('testAct', '66666');
+				// console.log('存入仓库后', this.$store.getters.testInfo);
+			},
+			async testLogin() {
+				let res = await this.$store.dispatch('user/testAct2', {
+					phone: '15609038533',
+					event: 'register'
+				})
+				console.log('测试登录返回值：', res);
+			},
+			testLogout() {
+				this.$store.dispatch('user/testAct3')
+				console.log('测试退出登录返回值：', this.$store.getters['user/testInfo3']);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/my/index.scss

@@ -2,6 +2,7 @@
 		box-sizing: border-box;
 	}
  
+ 
 	.container {
  
 		width: 100%;

pages/my/index.vue

@@ -25,6 +25,7 @@
 		<button open-type="getPhoneNumber" @getphonenumber="getphonenumber">获取用户手机号</button>
 		<button @click="get_user">获取用户头像昵称等信息</button>
 		<button @click="testPrcBox">测试隐私弹框</button>
+		<button @click="testchooseAndUp">选择图片上传</button>
 
 		<view class="">
 			头像
@@ -80,6 +81,16 @@
 			// })
 		},
 		methods: {
+			testchooseAndUp() {
+				let _this = this
+				uni.chooseImage({
+					success(res) {
+						console.log('res', res.tempFilePaths[0]);
+						_this.upImg(res.tempFilePaths[0])
+					}
+				})
+			},
+
 			handleAgreePrivacyAuthorization() {
 				// 用户点击同意按钮后
 				this.resolvePrivacyAuthorization({

pages/privicyPopup/index.vue

@@ -21,6 +21,7 @@
 		data() {
 			return {
 				showPrivacy: getApp().globalData.showPrivacy,
+				// showPrivacy: true,
 			}
 		},
 		onLoad(options) {},
@@ -30,6 +31,7 @@
 			},
 			getPrivacy() {
 				if (getApp().globalData.showPrivacy) {
+					// if (true) {
 					this.$refs.privacyPopup.$refs.popup.open();
 					return;
 				}

uni_modules/uview-ui/components/u-swiper/index.scss

@@ -0,0 +1,72 @@
+.cartDef{
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	.companyName{
+		font-size: 32rpx;
+		font-family: PingFang-SC-Bold, PingFang-SC;
+		font-weight: bold;
+		color: #333333;
+		margin-top: 22rpx;
+	}
+	.connect{
+		display: flex;
+		align-items: center;
+		flex-direction: row;
+		margin-top: 32rpx;
+		.txt{
+			font-size: 28rpx;
+			font-family: PingFang-SC-Medium, PingFang-SC;
+			font-weight: 500;
+			color: #666666;
+			display: inline-block;
+			margin-left: 8rpx;
+		}
+	}
+	
+	.connectDes{
+		display: flex;
+		align-items: center;
+		flex-direction: row;
+		margin-top: 12rpx;
+		.num{
+			font-size: 28rpx;
+			font-family: PingFang-SC-Medium, PingFang-SC;
+			font-weight: 500;
+			color: #333333;
+			margin-right: 24rpx;
+		}
+		.callBtn{
+			font-size: 28rpx;
+			font-family: PingFang-SC-Medium, PingFang-SC;
+			font-weight: 500;
+			color: #E77817;
+		}
+	}
+	
+	.addr{
+		display: flex;
+		align-items: center;
+		flex-direction: row;
+		.txt{
+			font-size: 28rpx;
+			font-family: PingFang-SC-Medium, PingFang-SC;
+			font-weight: 500;
+			color: #666666;
+			margin-left: 8rpx;
+		}
+	}
+	
+	.addrInfo{
+		display: flex;
+		align-items: center;
+		flex-direction: row;
+		.txt{
+			font-size: 28rpx;
+			font-family: PingFang-SC-Medium, PingFang-SC;
+			font-weight: 500;
+			color: #333333;
+			margin-right: 16rpx;
+		}
+	}
+}

uni_modules/uview-ui/components/u-swiper/props.js

@@ -1,125 +1,134 @@
 export default {
-    props: {
-        // 列表数组，元素可为字符串，如为对象可通过keyName指定目标属性名
-        list: {
-            type: Array,
-            default: uni.$u.props.swiper.list
-        },
-        // 是否显示面板指示器
-        indicator: {
-            type: Boolean,
-            default: uni.$u.props.swiper.indicator
-        },
-        // 指示器非激活颜色
-        indicatorActiveColor: {
-            type: String,
-            default: uni.$u.props.swiper.indicatorActiveColor
-        },
-        // 指示器的激活颜色
-        indicatorInactiveColor: {
-            type: String,
-            default: uni.$u.props.swiper.indicatorInactiveColor
-        },
-        // 指示器样式，可通过bottom，left，right进行定位
-        indicatorStyle: {
-            type: [String, Object],
-            default: uni.$u.props.swiper.indicatorStyle
-        },
-        // 指示器模式，line-线型，dot-点型
-        indicatorMode: {
-            type: String,
-            default: uni.$u.props.swiper.indicatorMode
-        },
-        // 是否自动切换
-        autoplay: {
-            type: Boolean,
-            default: uni.$u.props.swiper.autoplay
-        },
-        // 当前所在滑块的 index
-        current: {
-            type: [String, Number],
-            default: uni.$u.props.swiper.current
-        },
-        // 当前所在滑块的 item-id ，不能与 current 被同时指定
-        currentItemId: {
-            type: String,
-            default: uni.$u.props.swiper.currentItemId
-        },
-        // 滑块自动切换时间间隔
-        interval: {
-            type: [String, Number],
-            default: uni.$u.props.swiper.interval
-        },
-        // 滑块切换过程所需时间
-        duration: {
-            type: [String, Number],
-            default: uni.$u.props.swiper.duration
-        },
-        // 播放到末尾后是否重新回到开头
-        circular: {
-            type: Boolean,
-            default: uni.$u.props.swiper.circular
-        },
-        // 前边距，可用于露出前一项的一小部分，nvue和支付宝不支持
-        previousMargin: {
-            type: [String, Number],
-            default: uni.$u.props.swiper.previousMargin
-        },
-        // 后边距，可用于露出后一项的一小部分，nvue和支付宝不支持
-        nextMargin: {
-            type: [String, Number],
-            default: uni.$u.props.swiper.nextMargin
-        },
-        // 当开启时，会根据滑动速度，连续滑动多屏，支付宝不支持
-        acceleration: {
-            type: Boolean,
-            default: uni.$u.props.swiper.acceleration
-        },
-        // 同时显示的滑块数量，nvue、支付宝小程序不支持
-        displayMultipleItems: {
-            type: Number,
-            default: uni.$u.props.swiper.displayMultipleItems
-        },
-        // 指定swiper切换缓动动画类型，有效值：default、linear、easeInCubic、easeOutCubic、easeInOutCubic
-        // 只对微信小程序有效
-        easingFunction: {
-            type: String,
-            default: uni.$u.props.swiper.easingFunction
-        },
-        // list数组中指定对象的目标属性名
-        keyName: {
-            type: String,
-            default: uni.$u.props.swiper.keyName
-        },
-        // 图片的裁剪模式
-        imgMode: {
-            type: String,
-            default: uni.$u.props.swiper.imgMode
-        },
-        // 组件高度
-        height: {
-            type: [String, Number],
-            default: uni.$u.props.swiper.height
-        },
-        // 背景颜色
-        bgColor: {
-            type: String,
-            default: uni.$u.props.swiper.bgColor
-        },
-        // 组件圆角，数值或带单位的字符串
-        radius: {
-            type: [String, Number],
-            default: uni.$u.props.swiper.radius
-        },
-        // 是否加载中
-        loading: {
-            type: Boolean,
-            default: uni.$u.props.swiper.loading
-        },
-        // 是否显示标题，要求数组对象中有title属性
-        showTitle: {
-            type: Boolean,
-            default: uni.$u.props.swiper.showTitle
-        }
-    }
-}
+	props: {
+		type: {
+			type: String,
+			default: 'img'
+		},
+		defList: {
+			type: Array,
+			default: []
+		},
+
+		// 列表数组，元素可为字符串，如为对象可通过keyName指定目标属性名
+		list: {
+			type: Array,
+			default: uni.$u.props.swiper.list
+		},
+		// 是否显示面板指示器
+		indicator: {
+			type: Boolean,
+			default: uni.$u.props.swiper.indicator
+		},
+		// 指示器非激活颜色
+		indicatorActiveColor: {
+			type: String,
+			default: uni.$u.props.swiper.indicatorActiveColor
+		},
+		// 指示器的激活颜色
+		indicatorInactiveColor: {
+			type: String,
+			default: uni.$u.props.swiper.indicatorInactiveColor
+		},
+		// 指示器样式，可通过bottom，left，right进行定位
+		indicatorStyle: {
+			type: [String, Object],
+			default: uni.$u.props.swiper.indicatorStyle
+		},
+		// 指示器模式，line-线型，dot-点型
+		indicatorMode: {
+			type: String,
+			default: uni.$u.props.swiper.indicatorMode
+		},
+		// 是否自动切换
+		autoplay: {
+			type: Boolean,
+			default: uni.$u.props.swiper.autoplay
+		},
+		// 当前所在滑块的 index
+		current: {
+			type: [String, Number],
+			default: uni.$u.props.swiper.current
+		},
+		// 当前所在滑块的 item-id ，不能与 current 被同时指定
+		currentItemId: {
+			type: String,
+			default: uni.$u.props.swiper.currentItemId
+		},
+		// 滑块自动切换时间间隔
+		interval: {
+			type: [String, Number],
+			default: uni.$u.props.swiper.interval
+		},
+		// 滑块切换过程所需时间
+		duration: {
+			type: [String, Number],
+			default: uni.$u.props.swiper.duration
+		},
+		// 播放到末尾后是否重新回到开头
+		circular: {
+			type: Boolean,
+			default: uni.$u.props.swiper.circular
+		},
+		// 前边距，可用于露出前一项的一小部分，nvue和支付宝不支持
+		previousMargin: {
+			type: [String, Number],
+			default: uni.$u.props.swiper.previousMargin
+		},
+		// 后边距，可用于露出后一项的一小部分，nvue和支付宝不支持
+		nextMargin: {
+			type: [String, Number],
+			default: uni.$u.props.swiper.nextMargin
+		},
+		// 当开启时，会根据滑动速度，连续滑动多屏，支付宝不支持
+		acceleration: {
+			type: Boolean,
+			default: uni.$u.props.swiper.acceleration
+		},
+		// 同时显示的滑块数量，nvue、支付宝小程序不支持
+		displayMultipleItems: {
+			type: Number,
+			default: uni.$u.props.swiper.displayMultipleItems
+		},
+		// 指定swiper切换缓动动画类型，有效值：default、linear、easeInCubic、easeOutCubic、easeInOutCubic
+		// 只对微信小程序有效
+		easingFunction: {
+			type: String,
+			default: uni.$u.props.swiper.easingFunction
+		},
+		// list数组中指定对象的目标属性名
+		keyName: {
+			type: String,
+			default: uni.$u.props.swiper.keyName
+		},
+		// 图片的裁剪模式
+		imgMode: {
+			type: String,
+			default: uni.$u.props.swiper.imgMode
+		},
+		// 组件高度
+		height: {
+			type: [String, Number],
+			default: uni.$u.props.swiper.height
+		},
+		// 背景颜色
+		bgColor: {
+			type: String,
+			default: uni.$u.props.swiper.bgColor
+		},
+		// 组件圆角，数值或带单位的字符串
+		radius: {
+			type: [String, Number],
+			default: uni.$u.props.swiper.radius
+		},
+		// 是否加载中
+		loading: {
+			type: Boolean,
+			default: uni.$u.props.swiper.loading
+		},
+		// 是否显示标题，要求数组对象中有title属性
+		showTitle: {
+			type: Boolean,
+			default: uni.$u.props.swiper.showTitle
+		}
+	}
+}

uni_modules/uview-ui/components/u-swiper/u-swiper.vue

@@ -1,95 +1,104 @@
 <template>
-	<view
-		class="u-swiper"
-		:style="{
+	<view class="u-swiper" :style="{
 			backgroundColor: bgColor,
 			height: $u.addUnit(height),
 			borderRadius: $u.addUnit(radius)
-		}"
-	>
-		<view
-			class="u-swiper__loading"
-			v-if="loading"
-		>
+		}">
+		<view class="u-swiper__loading" v-if="loading">
 			<u-loading-icon mode="circle"></u-loading-icon>
 		</view>
-		<swiper
-			v-else
-			class="u-swiper__wrapper"
-			:style="{
+		<swiper v-if="!loading&&type=='img'" class="u-swiper__wrapper" :style="{
 				height: $u.addUnit(height),
-			}"
-			@change="change"
-			:circular="circular"
-			:interval="interval"
-			:duration="duration"
-			:autoplay="autoplay"
-			:current="current"
-			:currentItemId="currentItemId"
-			:previousMargin="$u.addUnit(previousMargin)"
-			:nextMargin="$u.addUnit(nextMargin)"
-			:acceleration="acceleration"
-			:displayMultipleItems="displayMultipleItems"
-			:easingFunction="easingFunction"
-		>
-			<swiper-item
-				class="u-swiper__wrapper__item"
-				v-for="(item, index) in list"
-				:key="index"
-			>
-				<view
-					class="u-swiper__wrapper__item__wrapper"
-					:style="[itemStyle(index)]"
-				>
+			}" @change="change" :circular="circular" :interval="interval" :duration="duration" :autoplay="autoplay"
+			:current="current" :currentItemId="currentItemId" :previousMargin="$u.addUnit(previousMargin)"
+			:nextMargin="$u.addUnit(nextMargin)" :acceleration="acceleration"
+			:displayMultipleItems="displayMultipleItems" :easingFunction="easingFunction">
+			<swiper-item class="u-swiper__wrapper__item" v-for="(item, index) in list" :key="index">
+				<view class="u-swiper__wrapper__item__wrapper" :style="[itemStyle(index)]">
 					<!-- 在nvue中，image图片的宽度默认为屏幕宽度，需要通过flex:1撑开，另外必须设置高度才能显示图片 -->
-					<image
-						class="u-swiper__wrapper__item__wrapper__image"
-						v-if="getItemType(item) === 'image'"
-						:src="getSource(item)"
-						:mode="imgMode"
-						@tap="clickHandler(index)"
-						:style="{
+					<!-- borderRadius: $u.addUnit(radius) -->
+					<image class="u-swiper__wrapper__item__wrapper__image" v-if="getItemType(item) === 'image'"
+						:src="getSource(item)" :mode="imgMode" @tap="clickHandler(index)" :style="{
 							height: $u.addUnit(height),
-							borderRadius: $u.addUnit(radius)
-						}"
-					></image>
-					<video
-						class="u-swiper__wrapper__item__wrapper__video"
-						v-if="getItemType(item) === 'video'"
-						:id="`video-${index}`"
-						:enable-progress-gesture="false"
-						:src="getSource(item)"
+						}" style=""></image>
+					<video class="u-swiper__wrapper__item__wrapper__video" v-if="getItemType(item) === 'video'"
+						:id="`video-${index}`" :enable-progress-gesture="false" :src="getSource(item)"
 						:poster="getPoster(item)"
-						:title="showTitle && $u.test.object(item) && item.title ? item.title : ''"
-						:style="{
+						:title="showTitle && $u.test.object(item) && item.title ? item.title : ''" :style="{
 							height: $u.addUnit(height)
-						}"
-						controls
-						@tap="clickHandler(index)"
-					></video>
-					<text
-						v-if="showTitle && $u.test.object(item) && item.title && $u.test.image(getSource(item))"
-						class="u-swiper__wrapper__item__wrapper__title u-line-1"
-					>{{ item.title }}</text>
+						}" controls @tap="clickHandler(index)"></video>
+					<text v-if="showTitle && $u.test.object(item) && item.title && $u.test.image(getSource(item))"
+						class="u-swiper__wrapper__item__wrapper__title u-line-1">{{ item.title }}</text>
+				</view>
+			</swiper-item>
+		</swiper>
+		<swiper v-if="!loading&&type=='def'" class="u-swiper__wrapper" :style="{
+				height: $u.addUnit(height),
+			}" @change="change" :circular="circular" :interval="interval" :duration="duration" :autoplay="autoplay"
+			:current="current" :currentItemId="currentItemId" :previousMargin="$u.addUnit(previousMargin)"
+			:nextMargin="$u.addUnit(nextMargin)" :acceleration="acceleration"
+			:displayMultipleItems="displayMultipleItems" :easingFunction="easingFunction">
+			<swiper-item class="u-swiper__wrapper__item" v-for="(item, index) in defList" :key="index">
+				<view class="u-swiper__wrapper__item__wrapper" :style="[itemStyle(index)]">
+					<view class="u-swiper__wrapper__item__wrapper__image cartDef" style="background: #FDFBFA;" :style="{
+						height: $u.addUnit(height),
+					}">
+						<image src="@/static/index/logo.png" mode=""
+							style="width: 104rpx;height: 104rpx;margin-top: 64rpx;"></image>
+						<view class="companyName">
+							吉格斯
+						</view>
+						<view class="connect">
+							<image src="@/static/index/dianhua.png" mode=""
+								style="width: 30rpx;height: 30rpx;display: inline-block;"></image>
+							<view class="txt">
+								联系电话
+							</view>
+						</view>
+
+						<view class="connectDes">
+							<view class="num">
+								{{item.phone}}
+							</view>
+							<view class="callBtn" @click="call(item.phone)">
+								拨号
+							</view>
+						</view>
+
+						<view class="addr">
+							<image src="@/static/index/weizhi.png" mode=""
+								style="width: 24rpx;height: 32rpx;display: inline-block;"></image>
+							<view class="txt">
+								{{item.addrName}}
+							</view>
+						</view>
+
+						<view class="addrInfo">
+							<view class="txt">
+								{{item.addrInfo}}
+							</view>
+							<image @click="daohang('四川省成都市金牛区长平街70号')" src="@/static/index/daohang.png" mode=""
+								style="width: 36rpx;height: 36rpx;display: inline-block;"></image>
+						</view>
+
+					</view>
 				</view>
 			</swiper-item>
 		</swiper>
 		<view class="u-swiper__indicator" :style="[$u.addStyle(indicatorStyle)]">
 			<slot name="indicator">
-				<u-swiper-indicator
-					v-if="!loading && indicator && !showTitle"
-					:indicatorActiveColor="indicatorActiveColor"
-					:indicatorInactiveColor="indicatorInactiveColor"
-					:length="list.length"
-					:current="currentIndex"
-					:indicatorMode="indicatorMode"
-				></u-swiper-indicator>
+				<u-swiper-indicator v-if="!loading && indicator && !showTitle"
+					:indicatorActiveColor="indicatorActiveColor" :indicatorInactiveColor="indicatorInactiveColor"
+					:length="list.length" :current="currentIndex" :indicatorMode="indicatorMode"></u-swiper-indicator>
 			</slot>
 		</view>
 	</view>
 </template>
 
 <script>
+	var QQMapWX = require('@/common/qqmap-wx-jssdk.min.js');
+	var qqmapsdk;
+
 	import props from './props.js';
 	/**
 	 * Swiper 轮播图
@@ -133,7 +142,7 @@
 		},
 		watch: {
 			current(val, preVal) {
-				if(val === preVal) return;
+				if (val === preVal) return;
 				this.currentIndex = val; // 和上游数据关联上
 			}
 		},
@@ -152,17 +161,65 @@
 					return style
 				}
 			}
+		},
+		onLoad() {
+
 		},
 		methods: {
-      getItemType(item) {
-        if (typeof item === 'string') return uni.$u.test.video(this.getSource(item)) ? 'video' : 'image'
-        if (typeof item === 'object' && this.keyName) {
-          if (!item.type) return uni.$u.test.video(this.getSource(item)) ? 'video' : 'image'
-          if (item.type === 'image') return 'image'
-          if (item.type === 'video') return 'video'
-          return 'image'
-        }
-      },
+			call(phone) {
+				uni.makePhoneCall({
+					phoneNumber: phone,
+				})
+			},
+			daohang(addr) {
+				// 实例化API核心类
+				qqmapsdk = new QQMapWX({
+					key: 'W4IBZ-EVOCV-GJVPF-5QVLU-5ZJTJ-CNFUD'
+				});
+
+				qqmapsdk.geocoder({
+					address: addr,
+					success: function(res) {
+						console.log('根据地名解析得到的经纬度信息：', res)
+						uni.openLocation({
+							name: addr,
+							address: res.result.address_components.province + res.result
+								.address_components.city + res.result.address_components.district + res
+								.result.address_components.street + res.result.address_components
+								.street_number + '号',
+							latitude: res.result.location.lat,
+							longitude: res.result.location.lng,
+							success: function() {
+								console.log('success');
+							}
+						});
+					},
+					complete: res => {}
+				})
+
+				// qqmapsdk.search({
+				// 	keyword: '酒店',
+				// 	success: function(res) {
+				// 		console.log(res);
+				// 	},
+				// 	fail: function(res) {
+				// 		console.log(res);
+				// 	},
+				// 	complete: function(res) {
+				// 		console.log(res);
+				// 	}
+				// });
+			},
+
+			getItemType(item) {
+				if (typeof item === 'string') return uni.$u.test.video(this.getSource(item)) ? 'video' : 'image'
+				if (typeof item === 'object' && this.keyName) {
+					if (!item.type) return uni.$u.test.video(this.getSource(item)) ? 'video' : 'image'
+					if (item.type === 'image') return 'image'
+					if (item.type === 'video') return 'video'
+					return 'image'
+				}
+			},
 			// 获取目标路径，可能数组中为字符串，对象的形式，额外可指定对象的目标属性名keyName
 			getSource(item) {
 				if (typeof item === 'string') return item
@@ -203,6 +260,7 @@
 
 <style lang="scss" scoped>
 	@import "../../libs/css/components.scss";
+	@import "./index.scss";
 
 	.u-swiper {
 		@include flex;
@@ -252,4 +310,4 @@
 			bottom: 10px;
 		}
 	}
-</style>
+</style>

unpackage/dist/build/mp-weixin/app.json

@@ -1,26 +1,28 @@
 {
   "pages": [
     "pages/index/index",
-    "pages/category/index",
+    "pages/mall/index",
     "pages/service/index",
     "pages/my/index",
     "pages/map/index",
-    "pages/qrPage/index"
+    "pages/qrPage/index",
+    "pages/test/index",
+    "pages/privicyPopup/index"
   ],
   "subPackages": [],
   "window": {
-    "navigationBarTextStyle": "white",
+    "navigationBarTextStyle": "black",
     "navigationBarTitleText": "uni-app",
     "navigationBarBackgroundColor": "#F8F8F8",
     "backgroundColor": "#F8F8F8",
     "navigationStyle": "custom"
   },
   "tabBar": {
-    "color": "black",
-    "selectedColor": "#1afa29",
+    "color": "#CBC8C7",
+    "selectedColor": "#F7790C",
     "borderStyle": "black",
     "backgroundColor": "#F8F8F8",
-    "fontSize": "12px",
+    "fontSize": "22rpx",
     "spacing": "5px",
     "height": "50px",
     "iconfontSrc": "static/fonts/iconfont.ttf",
@@ -39,10 +41,10 @@
         }
       },
       {
-        "pagePath": "pages/category/index",
-        "text": "分类",
-        "iconPath": "static/tabbar/cat.png",
-        "selectedIconPath": "static/tabbar/cat_a.png",
+        "pagePath": "pages/mall/index",
+        "text": "商城",
+        "iconPath": "static/tabbar/mall.png",
+        "selectedIconPath": "static/tabbar/mall_a.png",
         "iconfont": {
           "text": "",
           "selectedText": "",
@@ -53,7 +55,7 @@
       },
       {
         "pagePath": "pages/service/index",
-        "text": "售后",
+        "text": "服务",
         "iconPath": "static/tabbar/service.png",
         "selectedIconPath": "static/tabbar/service_a.png",
         "iconfont": {
@@ -91,6 +93,7 @@
     "chooseLocation"
   ],
   "usingComponents": {
-    "nav-bar": "/components/navBar/index"
+    "nav-bar": "/components/navBar/index",
+    "dpopup": "/components/popup/index"
   }
 }

unpackage/dist/build/mp-weixin/components/navBar/index.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/navBar/index"],{"19a0":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{statusBarHeight:20,navBareight:45,windowWidth:375}},props:{title:{type:String,default:""},color:{type:String,default:"#fff"},background:{type:String,default:"transparent"},back:{type:Boolean,default:!1}},created:function(){var n=t.getSystemInfoSync(),e=n.statusBarHeight,a=n.windowWidth;this.statusBarHeight=e,this.windowWidth=a;var i=t.getMenuButtonBoundingClientRect(),o=i.top,u=i.bottom,r=i.left;this.navBareight=u-e+(o-e),this.windowWidth=r},methods:{onBack:function(){this.$emit("onBack"),t.navigateBack({delta:1})}}};n.default=e}).call(this,e("543d")["default"])},"77ea":function(t,n,e){"use strict";e.r(n);var a=e("82a3"),i=e("cb3a");for(var o in i)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(o);e("f50a");var u=e("f0c5"),r=Object(u["a"])(i["default"],a["b"],a["c"],!1,null,"d336c544",null,!1,a["a"],void 0);n["default"]=r.exports},"82a3":function(t,n,e){"use strict";e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return o})),e.d(n,"a",(function(){return a}));var a={uniIcons:function(){return Promise.all([e.e("common/vendor"),e.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(e.bind(null,"f70d"))}},i=function(){var t=this.$createElement;this._self._c},o=[]},b821:function(t,n,e){},cb3a:function(t,n,e){"use strict";e.r(n);var a=e("19a0"),i=e.n(a);for(var o in a)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(o);n["default"]=i.a},f50a:function(t,n,e){"use strict";var a=e("b821"),i=e.n(a);i.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/navBar/index"],{"19a0":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{statusBarHeight:20,navBareight:45,windowWidth:375}},props:{title:{type:String,default:""},color:{type:String,default:"#fff"},background:{type:String,default:"transparent"},back:{type:Boolean,default:!1}},created:function(){var n=t.getSystemInfoSync(),e=n.statusBarHeight,i=n.windowWidth;this.statusBarHeight=e,this.windowWidth=i;var a=t.getMenuButtonBoundingClientRect(),o=a.top,u=a.bottom,c=a.left;this.navBareight=u-e+(o-e),this.windowWidth=c},methods:{onBack:function(){this.$emit("onBack"),t.navigateBack({delta:1})}}};n.default=e}).call(this,e("543d")["default"])},"58c9":function(t,n,e){"use strict";e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return o})),e.d(n,"a",(function(){return i}));var i={uniIcons:function(){return Promise.all([e.e("common/vendor"),e.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(e.bind(null,"f70d"))}},a=function(){var t=this.$createElement;this._self._c},o=[]},"5ed3":function(t,n,e){"use strict";var i=e("8bf5"),a=e.n(i);a.a},"77ea":function(t,n,e){"use strict";e.r(n);var i=e("58c9"),a=e("cb3a");for(var o in a)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(o);e("5ed3");var u=e("f0c5"),c=Object(u["a"])(a["default"],i["b"],i["c"],!1,null,"2caca766",null,!1,i["a"],void 0);n["default"]=c.exports},"8bf5":function(t,n,e){},cb3a:function(t,n,e){"use strict";e.r(n);var i=e("19a0"),a=e.n(i);for(var o in i)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(o);n["default"]=a.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/navBar/index-create-component',
     {

unpackage/dist/build/mp-weixin/components/navBar/index.wxml

@@ -1 +1 @@
-<view class="navbar data-v-d336c544" style="{{'height:'+(statusBarHeight+navBareight+'px')+';'+('background:'+(background)+';')}}"><view class="narbar-flexd data-v-d336c544" style="{{'background:'+(background)+';'}}"><view style="{{'height:'+(statusBarHeight+'px')+';'}}" class="data-v-d336c544"></view><view class="narbar-content data-v-d336c544" style="{{'height:'+(navBareight+'px')+';'}}"><block wx:if="{{back}}"><view data-event-opts="{{[['tap',[['onBack',['$event']]]]]}}" class="left data-v-d336c544" style="{{'color:'+(color)+';'+('padding-top:'+(paddingTop)+';')}}" bindtap="__e"><uni-icons vue-id="3a6d4f98-1" type="arrowleft" size="25" color="{{color}}" class="data-v-d336c544" bind:__l="__l"></uni-icons></view></block><view class="title data-v-d336c544" style="{{'color:'+(color)+';'}}">{{''+title+''}}</view></view></view><view class="navHeight data-v-d336c544" style="{{'height:'+(statusBarHeight+navBareight+'px')+';'}}"></view></view>
+<view class="navbar data-v-2caca766" style="{{'height:'+(statusBarHeight+navBareight+'px')+';'+('background:'+(background)+';')}}"><view class="narbar-flexd data-v-2caca766" style="{{'background:'+(background)+';'}}"><view style="{{'height:'+(statusBarHeight+'px')+';'}}" class="data-v-2caca766"></view><view class="narbar-content data-v-2caca766" style="{{'height:'+(navBareight+'px')+';'}}"><block wx:if="{{back}}"><view data-event-opts="{{[['tap',[['onBack',['$event']]]]]}}" class="left data-v-2caca766" style="{{'color:'+(color)+';'+('padding-top:'+(paddingTop)+';')}}" bindtap="__e"><uni-icons vue-id="3a6d4f98-1" type="arrowleft" size="25" color="{{color}}" class="data-v-2caca766" bind:__l="__l"></uni-icons></view></block><block wx:else><view data-event-opts="{{[['tap',[['',['$event']]]]]}}" class="left data-v-2caca766" bindtap="__e"><image style="width:40rpx;height:40rpx;margin-right:8rpx;" showLoading="{{true}}" src="/static/index/logo.png" data-event-opts="{{[['tap',[['',['$event']]]]]}}" bindtap="__e" class="data-v-2caca766"></image></view></block><view class="title data-v-2caca766" style="{{'color:'+(color)+';'}}">{{''+title+''}}</view></view></view><view class="navHeight data-v-2caca766" style="{{'height:'+(statusBarHeight+navBareight+'px')+';'}}"></view></view>

unpackage/dist/build/mp-weixin/components/navBar/index.wxss

@@ -1 +1 @@
-.navbar.data-v-d336c544{background:green}.navbar .narbar-flexd.data-v-d336c544{background:green;position:fixed;top:0;left:0;z-index:99;width:100%}.navbar .narbar-flexd .narbar-content.data-v-d336c544{padding:0 30px;display:flex;box-sizing:border-box;justify-content:center;align-items:center}.navbar .narbar-flexd .narbar-content .left.data-v-d336c544{position:absolute;left:5%;font-weight:600}.navbar .narbar-flexd .narbar-content .title.data-v-d336c544{font-size:16px;color:#fff;font-weight:600}.navbar .navHeight.data-v-d336c544{height:60px}
+.navbar.data-v-2caca766{background:green}.navbar .narbar-flexd.data-v-2caca766{background:green;position:fixed;top:0;left:0;z-index:99;width:100%}.navbar .narbar-flexd .narbar-content.data-v-2caca766{padding:0 40rpx;display:flex;box-sizing:border-box;align-items:center}.navbar .narbar-flexd .narbar-content .left.data-v-2caca766{font-weight:600;display:flex;align-items:center}.navbar .narbar-flexd .narbar-content .title.data-v-2caca766{font-size:16px;color:#fff;font-weight:600}.navbar .navHeight.data-v-2caca766{height:60px}

unpackage/dist/build/mp-weixin/components/popup/index.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/popup/index"],{"1c2d":function(n,e,t){"use strict";t.r(e);var u=t("d889"),o=t("ef83");for(var i in o)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(i);t("f488");var f=t("f0c5"),c=Object(f["a"])(o["default"],u["b"],u["c"],!1,null,"768dd035",null,!1,u["a"],void 0);e["default"]=c.exports},"6f55":function(n,e,t){},d671:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;e.default={props:["show","mode","round"],methods:{close:function(){this.$emit("close")},open:function(){this.$emit("open")}}}},d889:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return i})),t.d(e,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uni_modules/uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"f56b"))}},o=function(){var n=this.$createElement;this._self._c},i=[]},ef83:function(n,e,t){"use strict";t.r(e);var u=t("d671"),o=t.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(i);e["default"]=o.a},f488:function(n,e,t){"use strict";var u=t("6f55"),o=t.n(u);o.a}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'components/popup/index-create-component',
+    {
+        'components/popup/index-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("1c2d"))
+        })
+    },
+    [['components/popup/index-create-component']]
+]);

unpackage/dist/build/mp-weixin/components/popup/index.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "u-popup": "/uni_modules/uview-ui/components/u-popup/u-popup"
+  },
+  "component": true
+}

unpackage/dist/build/mp-weixin/components/popup/index.wxml

@@ -0,0 +1 @@
+<view class="data-v-768dd035"><u-popup vue-id="9b043d7c-1" show="{{show}}" mode="{{mode}}" round="{{round}}" data-event-opts="{{[['^close',[['close']]],['^open',[['open']]]]}}" bind:close="__e" bind:open="__e" class="data-v-768dd035" bind:__l="__l" vue-slots="{{['default']}}"><view class="topBar data-v-768dd035">按钮等<button data-event-opts="{{[['tap',[['close',['$event']]]]]}}" bindtap="__e" class="data-v-768dd035">关闭</button></view><slot name="content"></slot></u-popup></view>

unpackage/dist/build/mp-weixin/components/privacyPopup/index.js

@@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/privacyPopup/index"],{1588:function(n,t,e){},"16a1":function(n,t,e){"use strict";var u=e("1588"),i=e.n(u);i.a},"6dad":function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={data:function(){return{title:"用户隐私保护提示",desc1:"感谢您使用本产品，您使用本产品前应当仔细阅读并同意",urlTitle:"《小程序隐私保护指引》",desc2:"当您点击同意并开始使用产品服务时，即表示你已理解并同意该条款内容，该条款将对您产生法律约束力。如您拒绝，将无法更好的体验产品。"}},methods:{openPrivacyContract:function(){n.openPrivacyContract({})},handleAgreePrivacyAuthorization:function(){getApp().globalData.showPrivacy=!1,this.$emit("confirm"),this.$refs.popup.close()},handleDisagree:function(){this.$refs.popup.close()}}};t.default=e}).call(this,e("bc2e")["default"])},c9ee:function(n,t,e){"use strict";e.r(t);var u=e("ed19"),i=e("ecc1");for(var c in i)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return i[n]}))}(c);e("16a1");var o=e("f0c5"),r=Object(o["a"])(i["default"],u["b"],u["c"],!1,null,"2f94559f",null,!1,u["a"],void 0);t["default"]=r.exports},ecc1:function(n,t,e){"use strict";e.r(t);var u=e("6dad"),i=e.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);t["default"]=i.a},ed19:function(n,t,e){"use strict";e.d(t,"b",(function(){return i})),e.d(t,"c",(function(){return c})),e.d(t,"a",(function(){return u}));var u={uniPopup:function(){return e.e("uni_modules/uni-popup/components/uni-popup/uni-popup").then(e.bind(null,"cf84"))}},i=function(){var n=this.$createElement;this._self._c},c=[]}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'components/privacyPopup/index-create-component',
+    {
+        'components/privacyPopup/index-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('543d')['createComponent'](__webpack_require__("c9ee"))
+        })
+    },
+    [['components/privacyPopup/index-create-component']]
+]);

unpackage/dist/build/mp-weixin/components/privacyPopup/index.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup"
+  },
+  "component": true
+}

unpackage/dist/build/mp-weixin/components/privacyPopup/index.wxml

@@ -0,0 +1 @@
+<uni-popup vue-id="4a802978-1" type="center" is-mask-click="{{false}}" data-ref="popup" class="data-v-2f94559f vue-ref" bind:__l="__l" vue-slots="{{['default']}}"><view class="popup-box data-v-2f94559f"><view class="weui-half-screen-dialog__hd data-v-2f94559f">{{''+title+''}}</view><view class="weui-half-screen-dialog__bd data-v-2f94559f"><text class="weui-half-screen-dialog__tips data-v-2f94559f">{{desc1}}</text><text data-event-opts="{{[['tap',[['openPrivacyContract',['$event']]]]]}}" class="weui-half-screen-dialog__tips color-8BC21F data-v-2f94559f" bindtap="__e">{{''+urlTitle+''}}</text><text class="weui-half-screen-dialog__tips data-v-2f94559f">{{desc2}}</text></view><view class="weui-half-screen-dialog__ft data-v-2f94559f"><button data-event-opts="{{[['tap',[['handleDisagree',['$event']]]]]}}" class="weui-btn data-v-2f94559f" bindtap="__e">拒绝</button><button class="weui-btn agree data-v-2f94559f" id="agree-btn" type="default" open-type="agreePrivacyAuthorization" data-event-opts="{{[['agreeprivacyauthorization',[['handleAgreePrivacyAuthorization',['$event']]]]]}}" bindagreeprivacyauthorization="__e">同意</button></view></view></uni-popup>

unpackage/dist/build/mp-weixin/components/privacyPopup/index.wxss

@@ -0,0 +1 @@
+.popup-box.data-v-2f94559f{width:80vw;overflow:hidden;background:#fff;padding:30rpx;border-radius:24rpx}.popup-box .weui-half-screen-dialog__hd.data-v-2f94559f{font-size:48rpx;font-family:Source Han Sans CN-Bold,Source Han Sans CN;font-weight:700;color:#000;line-height:56rpx}.popup-box .weui-half-screen-dialog__bd.data-v-2f94559f{margin-top:48rpx;text-indent:2em}.popup-box .weui-half-screen-dialog__bd .weui-half-screen-dialog__tips.data-v-2f94559f{font-size:28rpx;font-family:Source Han Sans CN-Normal,Source Han Sans CN;font-weight:400;color:#000;line-height:33rpx}.popup-box .weui-half-screen-dialog__ft.data-v-2f94559f{display:flex;justify-content:space-evenly;align-items:center;margin-top:48rpx}.popup-box .weui-half-screen-dialog__ft .weui-btn.data-v-2f94559f{padding:0 60rpx;margin:0;background:none;font-size:32rpx;font-family:Source Han Sans CN-Normal,Source Han Sans CN;font-weight:400;color:#000;line-height:80rpx}.popup-box .weui-half-screen-dialog__ft .agree.data-v-2f94559f{color:#fff;background:linear-gradient(90deg,#8bc21f,#7ab30a)}.popup-box .color-8BC21F.data-v-2f94559f{color:#8bc21f!important}

unpackage/dist/build/mp-weixin/pages/category/index.wxml

@@ -1 +0,0 @@
-<view class="data-v-72a26d37"><nav-bar vue-id="819668e8-1" title="分类" back="{{false}}" color="white" background="green" class="data-v-72a26d37" bind:__l="__l"></nav-bar><u-sticky vue-id="819668e8-2" bgColor="#fff" class="data-v-72a26d37" bind:__l="__l" vue-slots="{{['default']}}"><u-tabs vue-id="{{('819668e8-3')+','+('819668e8-2')}}" list="{{list1}}" class="data-v-72a26d37" bind:__l="__l"></u-tabs></u-sticky><view class="page-body data-v-72a26d37" style="{{('height:'+height+'px')}}"><scroll-view class="nav-left data-v-72a26d37" style="{{('height:'+height+'px')}}" scroll-y="{{true}}" scroll-top="{{scrollLeftTop}}" scroll-with-animation="{{true}}"><block wx:for="{{classifyData}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['categoryClickMain',[index]]]]]}}" class="{{['nav-left-item','data-v-72a26d37',index==categoryActive?'active':'']}}" bindtap="__e">{{''+item.name+''}}</view></block></scroll-view><scroll-view class="nav-right data-v-72a26d37" style="{{('height:'+height+'px')}}" scroll-y="{{true}}" scroll-top="{{scrollTop}}" scroll-with-animation="{{true}}" data-event-opts="{{[['scroll',[['scroll',['$event']]]]]}}" bindscroll="__e"><block wx:for="{{classifyData}}" wx:for-item="foods" wx:for-index="index" wx:key="index"><view class="box data-v-72a26d37"><view style="margin-bottom:10rpx;font-weight:600;" class="data-v-72a26d37">{{foods.name}}</view><block wx:for="{{foods.foods}}" wx:for-item="item" wx:for-index="i" wx:key="i"><view class="nav-right-item data-v-72a26d37" id="{{i==0?'first':''}}" data-event-opts="{{[['tap',[['cart',['$0'],[[['classifyData','',index],['foods','',i,'name']]]]]]]}}" bindtap="__e"><image src="https://img.tnblog.net/bigclassimg/1net.png" class="data-v-72a26d37"></image><view class="right_item_name data-v-72a26d37">{{item.name}}</view></view></block></view></block></scroll-view></view></view>

unpackage/dist/build/mp-weixin/pages/category/index.wxss

@@ -1 +0,0 @@
-.page-body.data-v-72a26d37{display:flex;background:#fff;overflow:hidden;position:fixed}.nav.data-v-72a26d37{display:flex;width:100%}.nav-left.data-v-72a26d37{width:25%;background:#fafafa}.nav-left-item.data-v-72a26d37{height:100rpx;border-right:solid 1px #f1f1f1;border-bottom:solid 1px #f1f1f1;font-size:30rpx;display:flex;align-items:center;justify-content:center}.nav-left-item.data-v-72a26d37:last-child{border-bottom:none}.nav-right.data-v-72a26d37{width:75%}.box.data-v-72a26d37{display:block;overflow:hidden;border-bottom:20rpx solid #f3f3f3}.box.data-v-72a26d37:last-child{border:none;min-height:100vh}.nav-right-item.data-v-72a26d37{width:29%;min-height:220rpx;float:left;text-align:center;padding:11rpx;font-size:28rpx}.nav-right-item image.data-v-72a26d37{width:120rpx;height:120rpx}.active.data-v-72a26d37{color:#ff80ab;background:#fff;border-right:0}.data-v-72a26d37::-webkit-scrollbar{width:0;height:0;color:transparent}.right_item_name.data-v-72a26d37{width:100%;word-break:break-all;word-wrap:break-word;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;overflow:hidden}.data-v-72a26d37 .u-sticky{top:153rpx!important}

unpackage/dist/build/mp-weixin/pages/index/index.json

@@ -1,6 +1,7 @@
 {
   "navigationBarTitleText": "首页",
   "usingComponents": {
-    "u-button": "/uni_modules/uview-ui/components/u-button/u-button"
+    "u-swiper": "/uni_modules/uview-ui/components/u-swiper/u-swiper",
+    "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore"
   }
 }

unpackage/dist/build/mp-weixin/pages/mall/index.wxml

@@ -0,0 +1 @@
+<view class="data-v-8ac463e6"><nav-bar vue-id="78e1f036-1" title="分类" back="{{false}}" color="white" background="green" class="data-v-8ac463e6" bind:__l="__l"></nav-bar><u-sticky vue-id="78e1f036-2" bgColor="#fff" class="data-v-8ac463e6" bind:__l="__l" vue-slots="{{['default']}}"><u-tabs vue-id="{{('78e1f036-3')+','+('78e1f036-2')}}" list="{{list1}}" scrollable="{{false}}" class="data-v-8ac463e6" bind:__l="__l"></u-tabs></u-sticky><view class="page-body data-v-8ac463e6" style="{{('height:'+height+'px')}}"><scroll-view class="nav-left data-v-8ac463e6" style="{{('height:'+height+'px')}}" scroll-y="{{true}}" scroll-top="{{scrollLeftTop}}" scroll-with-animation="{{true}}"><block wx:for="{{classifyData}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['categoryClickMain',[index]]]]]}}" class="{{['nav-left-item','data-v-8ac463e6',index==categoryActive?'active':'']}}" bindtap="__e">{{''+item.name+''}}</view></block></scroll-view><scroll-view class="nav-right data-v-8ac463e6" style="{{('height:'+height+'px')}}" scroll-y="{{true}}" scroll-top="{{scrollTop}}" scroll-with-animation="{{true}}" data-event-opts="{{[['scroll',[['scroll',['$event']]]]]}}" bindscroll="__e"><block wx:for="{{classifyData}}" wx:for-item="foods" wx:for-index="index" wx:key="index"><view class="box data-v-8ac463e6"><view style="margin-bottom:10rpx;font-weight:600;" class="data-v-8ac463e6">{{foods.name}}</view><block wx:for="{{foods.foods}}" wx:for-item="item" wx:for-index="i" wx:key="i"><view class="nav-right-item data-v-8ac463e6" id="{{i==0?'first':''}}" data-event-opts="{{[['tap',[['cart',['$0'],[[['classifyData','',index],['foods','',i,'name']]]]]]]}}" bindtap="__e"><image src="https://img.tnblog.net/bigclassimg/1net.png" class="data-v-8ac463e6"></image><view class="right_item_name data-v-8ac463e6">{{item.name}}</view></view></block></view></block></scroll-view></view></view>

unpackage/dist/build/mp-weixin/pages/mall/index.wxss

@@ -0,0 +1 @@
+.page-body.data-v-8ac463e6{display:flex;background:#fff;overflow:hidden;position:fixed}.nav.data-v-8ac463e6{display:flex;width:100%}.nav-left.data-v-8ac463e6{width:25%;background:#fafafa}.nav-left-item.data-v-8ac463e6{height:100rpx;border-right:solid 1px #f1f1f1;border-bottom:solid 1px #f1f1f1;font-size:30rpx;display:flex;align-items:center;justify-content:center}.nav-left-item.data-v-8ac463e6:last-child{border-bottom:none}.nav-right.data-v-8ac463e6{width:75%}.box.data-v-8ac463e6{display:block;overflow:hidden;border-bottom:20rpx solid #f3f3f3}.box.data-v-8ac463e6:last-child{border:none;min-height:100vh}.nav-right-item.data-v-8ac463e6{width:29%;min-height:220rpx;float:left;text-align:center;padding:11rpx;font-size:28rpx}.nav-right-item image.data-v-8ac463e6{width:120rpx;height:120rpx}.active.data-v-8ac463e6{color:#ff80ab;background:#fff;border-right:0}.data-v-8ac463e6::-webkit-scrollbar{width:0;height:0;color:transparent}.right_item_name.data-v-8ac463e6{width:100%;word-break:break-all;word-wrap:break-word;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;overflow:hidden}.data-v-8ac463e6 .u-sticky{top:153rpx!important}

unpackage/dist/build/mp-weixin/pages/my/index.wxss

@@ -1,4 +1,4 @@
-view.data-v-9feb6eba{box-sizing:border-box}.container.data-v-9feb6eba{width:100%;height:100%;position:absolute;left:0;bottom:0;padding:0 20px;box-sizing:border-box;display:flex;flex-direction:column;background-color:#fff;border-top-left-radius:10px;border-top-right-radius:10px}.container .title.data-v-9feb6eba{width:100%;height:12%;font-size:20px;font-weight:700;padding-top:20px}.container .title text.data-v-9feb6eba:nth-child(2){display:block;font-size:14px;font-weight:400;margin-top:5px}.container .choose-avatar-row.data-v-9feb6eba,
-.container .choose-nickname-row.data-v-9feb6eba{width:100%;height:9%;display:flex;justify-content:flex-start;align-items:center;padding:10px 2px;font-size:14px;border-top:1px solid #ccc;border-bottom:1px solid #ccc}.container .choose-avatar-row .avatar-wrapper.data-v-9feb6eba,
-.container .choose-nickname-row .avatar-wrapper.data-v-9feb6eba{width:40px;height:40px;margin:0;padding:0;margin-right:10px}.container .choose-avatar-row .avatar-wrapper .avatar.data-v-9feb6eba,
-.container .choose-nickname-row .avatar-wrapper .avatar.data-v-9feb6eba{width:100%;height:100%}.container .choose-nickname-row.data-v-9feb6eba{border-top:none}.container .choose-nickname-row text.data-v-9feb6eba{width:45px;margin-right:10px}.container .login-row.data-v-9feb6eba{width:100%;height:30%;padding-top:20px;display:flex}.container .login-row button.data-v-9feb6eba{font-size:14px;width:30%;height:40px;display:flex;align-items:center;justify-content:center;border-color:transparent;color:#07c160}.container .login-row .inactive.data-v-9feb6eba{color:#ccc}
+view.data-v-af94b9e0{box-sizing:border-box}.container.data-v-af94b9e0{width:100%;height:100%;position:absolute;left:0;bottom:0;padding:0 20px;box-sizing:border-box;display:flex;flex-direction:column;background-color:#fff;border-top-left-radius:10px;border-top-right-radius:10px}.container .title.data-v-af94b9e0{width:100%;height:12%;font-size:20px;font-weight:700;padding-top:20px}.container .title text.data-v-af94b9e0:nth-child(2){display:block;font-size:14px;font-weight:400;margin-top:5px}.container .choose-avatar-row.data-v-af94b9e0,
+.container .choose-nickname-row.data-v-af94b9e0{width:100%;height:9%;display:flex;justify-content:flex-start;align-items:center;padding:10px 2px;font-size:14px;border-top:1px solid #ccc;border-bottom:1px solid #ccc}.container .choose-avatar-row .avatar-wrapper.data-v-af94b9e0,
+.container .choose-nickname-row .avatar-wrapper.data-v-af94b9e0{width:40px;height:40px;margin:0;padding:0;margin-right:10px}.container .choose-avatar-row .avatar-wrapper .avatar.data-v-af94b9e0,
+.container .choose-nickname-row .avatar-wrapper .avatar.data-v-af94b9e0{width:100%;height:100%}.container .choose-nickname-row.data-v-af94b9e0{border-top:none}.container .choose-nickname-row text.data-v-af94b9e0{width:45px;margin-right:10px}.container .login-row.data-v-af94b9e0{width:100%;height:30%;padding-top:20px;display:flex}.container .login-row button.data-v-af94b9e0{font-size:14px;width:30%;height:40px;display:flex;align-items:center;justify-content:center;border-color:transparent;color:#07c160}.container .login-row .inactive.data-v-af94b9e0{color:#ccc}

unpackage/dist/build/mp-weixin/pages/privicyPopup/index.js

@@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/privicyPopup/index"],{"4e97":function(e,n,t){"use strict";t.r(n);var o=t("cf58"),c=t.n(o);for(var i in o)["default"].indexOf(i)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(i);n["default"]=c.a},6782:function(e,n,t){"use strict";t.d(n,"b",(function(){return o})),t.d(n,"c",(function(){return c})),t.d(n,"a",(function(){}));var o=function(){var e=this.$createElement;this._self._c},c=[]},"699c":function(e,n,t){"use strict";(function(e,n){var o=t("4ea4");t("2707");o(t("66fd"));var c=o(t("ef3e"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(c.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},"6d29":function(e,n,t){"use strict";var o=t("e0a6"),c=t.n(o);c.a},cf58:function(e,n,t){"use strict";(function(e){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={components:{PrivacyPopup:function(){t.e("components/privacyPopup/index").then(function(){return resolve(t("c9ee"))}.bind(null,t)).catch(t.oe)}},data:function(){return{showPrivacy:getApp().globalData.showPrivacy}},onLoad:function(e){},methods:{confirm:function(){this.showPrivacy=!1},getPrivacy:function(){getApp().globalData.showPrivacy&&this.$refs.privacyPopup.$refs.popup.open()},onGetPhoneNumber:function(n){"getPhoneNumber:fail:user deny"==n.detail.errMsg?e.showToast({icon:"none",title:"用户拒绝"}):n.detail.code&&this.loginWeiXin(n.detail.code)}}};n.default=o}).call(this,t("543d")["default"])},e0a6:function(e,n,t){},ef3e:function(e,n,t){"use strict";t.r(n);var o=t("6782"),c=t("4e97");for(var i in c)["default"].indexOf(i)<0&&function(e){t.d(n,e,(function(){return c[e]}))}(i);t("6d29");var a=t("f0c5"),u=Object(a["a"])(c["default"],o["b"],o["c"],!1,null,"86b4cb10",null,!1,o["a"],void 0);n["default"]=u.exports}},[["699c","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pages/privicyPopup/index.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "隐私弹窗页面",
+  "usingComponents": {
+    "privacy-popup": "/components/privacyPopup/index"
+  }
+}

unpackage/dist/build/mp-weixin/pages/privicyPopup/index.wxml

@@ -0,0 +1 @@
+<view class="page data-v-86b4cb10"><nav-bar vue-id="efde2564-1" title="隐私弹窗" back="{{true}}" color="white" background="green" class="data-v-86b4cb10" bind:__l="__l"></nav-bar><block wx:if="{{showPrivacy}}"><button data-event-opts="{{[['tap',[['getPrivacy',['$event']]]]]}}" class="btn data-v-86b4cb10" bindtap="__e">获取头像</button></block><block wx:else><button class="btn data-v-86b4cb10" open-type="chooseAvatar" data-event-opts="{{[['chooseavatar',[['onChooseAvatar',['$event']]]]]}}" bindchooseavatar="__e">获取头像</button></block><privacy-popup bind:confirm="__e" vue-id="efde2564-2" data-ref="privacyPopup" data-event-opts="{{[['^confirm',[['confirm']]]]}}" class="data-v-86b4cb10 vue-ref" bind:__l="__l"></privacy-popup></view>

unpackage/dist/build/mp-weixin/pages/qrPage/index.wxml

@@ -1 +1 @@
-<view class="container data-v-8aea22fc"><nav-bar vue-id="1feea8ba-1" title="二维码进入的页面" back="{{true}}" color="white" background="green" class="data-v-8aea22fc" bind:__l="__l"></nav-bar><button data-event-opts="{{[['tap',[['getAccessToken',['$event']]]]]}}" bindtap="__e" class="data-v-8aea22fc">生成AccessToken</button><button data-event-opts="{{[['tap',[['genQr',['$event']]]]]}}" bindtap="__e" class="data-v-8aea22fc">生成进入小程序的二维码</button><button data-event-opts="{{[['tap',[['createPoster',['$event']]]]]}}" bindtap="__e" class="data-v-8aea22fc">测试生成海报</button><image src="{{testUrl}}" mode data-event-opts="{{[['tap',[['previewPic',['$event']]]]]}}" bindtap="__e" class="data-v-8aea22fc"></image><u-popup vue-id="1feea8ba-2" show="{{showPoster}}" mode="bottom" data-event-opts="{{[['^close',[['e0']]]]}}" bind:close="__e" class="data-v-8aea22fc" bind:__l="__l" vue-slots="{{['default']}}"><scroll-view style="{{'max-height:'+(posterheight+'px')+';'}}" scroll-y="true" class="data-v-8aea22fc"><wike-painter vue-id="{{('1feea8ba-3')+','+('1feea8ba-2')}}" board="{{posterObj}}" data-ref="painter" data-event-opts="{{[['^done',[['posterSuccess']]]]}}" bind:done="__e" class="data-v-8aea22fc vue-ref" bind:__l="__l"></wike-painter><view style="height:78px;" class="data-v-8aea22fc"></view><view class="dygbhg data-v-8aea22fc"><view data-event-opts="{{[['tap',[['e1',['$event']]]]]}}" class="whole data-v-8aea22fc" bindtap="__e">取消</view><view data-event-opts="{{[['tap',[['toSave',['$event']]]]]}}" class="distinguish data-v-8aea22fc" bindtap="__e">保存/分享</view></view></scroll-view></u-popup></view>
+<view class="container data-v-ebc127dc"><nav-bar vue-id="1feea8ba-1" title="二维码进入的页面" back="{{true}}" color="white" background="green" class="data-v-ebc127dc" bind:__l="__l"></nav-bar><button data-event-opts="{{[['tap',[['getAccessToken',['$event']]]]]}}" bindtap="__e" class="data-v-ebc127dc">生成AccessToken</button><button data-event-opts="{{[['tap',[['genQr',['$event']]]]]}}" bindtap="__e" class="data-v-ebc127dc">生成进入小程序的二维码</button><button data-event-opts="{{[['tap',[['createPoster',['$event']]]]]}}" bindtap="__e" class="data-v-ebc127dc">测试生成海报</button><image src="{{testUrl}}" mode data-event-opts="{{[['tap',[['previewPic',['$event']]]]]}}" bindtap="__e" class="data-v-ebc127dc"></image><u-popup vue-id="1feea8ba-2" show="{{showPoster}}" mode="bottom" data-event-opts="{{[['^close',[['e0']]]]}}" bind:close="__e" class="data-v-ebc127dc" bind:__l="__l" vue-slots="{{['default']}}"><scroll-view style="{{'max-height:'+(posterheight+'px')+';'}}" scroll-y="true" class="data-v-ebc127dc"><wike-painter vue-id="{{('1feea8ba-3')+','+('1feea8ba-2')}}" board="{{posterObj}}" data-ref="painter" data-event-opts="{{[['^done',[['posterSuccess']]]]}}" bind:done="__e" class="data-v-ebc127dc vue-ref" bind:__l="__l"></wike-painter><view style="height:78px;" class="data-v-ebc127dc"></view><view class="dygbhg data-v-ebc127dc"><view data-event-opts="{{[['tap',[['e1',['$event']]]]]}}" class="whole data-v-ebc127dc" bindtap="__e">取消</view><view data-event-opts="{{[['tap',[['toSave',['$event']]]]]}}" class="distinguish data-v-ebc127dc" bindtap="__e">保存/分享</view></view></scroll-view></u-popup></view>

unpackage/dist/build/mp-weixin/pages/service/index.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/service/index"],{"050b":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;n.default={data:function(){return{}},methods:{}}},"33c5":function(e,n,t){},"40bf":function(e,n,t){"use strict";(function(e,n){var u=t("4ea4");t("2707");u(t("66fd"));var c=u(t("d16f"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(c.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},5363:function(e,n,t){"use strict";var u=t("33c5"),c=t.n(u);c.a},a9ef:function(e,n,t){"use strict";t.r(n);var u=t("050b"),c=t.n(u);for(var f in u)["default"].indexOf(f)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(f);n["default"]=c.a},d16f:function(e,n,t){"use strict";t.r(n);var u=t("e32f"),c=t("a9ef");for(var f in c)["default"].indexOf(f)<0&&function(e){t.d(n,e,(function(){return c[e]}))}(f);t("5363");var a=t("f0c5"),r=Object(a["a"])(c["default"],u["b"],u["c"],!1,null,"27c54dd0",null,!1,u["a"],void 0);n["default"]=r.exports},e32f:function(e,n,t){"use strict";t.d(n,"b",(function(){return u})),t.d(n,"c",(function(){return c})),t.d(n,"a",(function(){}));var u=function(){var e=this.$createElement;this._self._c},c=[]}},[["40bf","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/service/index"],{"050b":function(e,n,t){"use strict";(function(e){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var t={data:function(){return{}},methods:{goDt:function(){e.navigateTo({url:"/pages/map/index"})}}};n.default=t}).call(this,t("543d")["default"])},"098c":function(e,n,t){"use strict";t.d(n,"b",(function(){return a})),t.d(n,"c",(function(){return u})),t.d(n,"a",(function(){}));var a=function(){var e=this.$createElement;this._self._c},u=[]},"1ef6":function(e,n,t){},"40bf":function(e,n,t){"use strict";(function(e,n){var a=t("4ea4");t("2707");a(t("66fd"));var u=a(t("d16f"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(u.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},a9ef:function(e,n,t){"use strict";t.r(n);var a=t("050b"),u=t.n(a);for(var f in a)["default"].indexOf(f)<0&&function(e){t.d(n,e,(function(){return a[e]}))}(f);n["default"]=u.a},d16f:function(e,n,t){"use strict";t.r(n);var a=t("098c"),u=t("a9ef");for(var f in u)["default"].indexOf(f)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(f);t("ef2d");var c=t("f0c5"),i=Object(c["a"])(u["default"],a["b"],a["c"],!1,null,"4763274a",null,!1,a["a"],void 0);n["default"]=i.exports},ef2d:function(e,n,t){"use strict";var a=t("1ef6"),u=t.n(a);u.a}},[["40bf","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pages/service/index.wxml

@@ -1 +1 @@
-<view class="container data-v-27c54dd0"><nav-bar vue-id="d0a39cd2-1" title="售后" back="{{false}}" color="white" background="green" class="data-v-27c54dd0" bind:__l="__l"></nav-bar></view>
+<view class="container data-v-4763274a"><nav-bar vue-id="d0a39cd2-1" title="售后" back="{{false}}" color="white" background="green" class="data-v-4763274a" bind:__l="__l"></nav-bar><button data-event-opts="{{[['tap',[['goDt',['$event']]]]]}}" bindtap="__e" class="data-v-4763274a">跳地图</button></view>

unpackage/dist/build/mp-weixin/pages/test/index.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "接口测试页面",
+  "usingComponents": {}
+}

unpackage/dist/build/mp-weixin/project.config.json

@@ -1,9 +1,5 @@
 {
   "description": "项目配置文件。",
-  "packOptions": {
-    "ignore": [],
-    "include": []
-  },
   "setting": {
     "urlCheck": false,
     "es6": false,
@@ -16,15 +12,22 @@
       "disablePlugins": [],
       "outputPath": ""
     },
-    "condition": false
+    "coverView": false,
+    "enhance": false,
+    "showShadowRootInWxmlPanel": false,
+    "packNpmRelationList": [],
+    "ignoreUploadUnusedFiles": true
   },
   "compileType": "miniprogram",
-  "libVersion": "3.0.1",
-  "appid": "wx98ab2939999e13de",
-  "projectname": "jiancaiPro",
   "condition": {},
   "editorSetting": {
     "tabIndent": "insertSpaces",
     "tabSize": 2
-  }
+  },
+  "libVersion": "3.0.2",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "appid": "wx98ab2939999e13de"
 }

unpackage/dist/build/mp-weixin/project.private.config.json

@@ -1,6 +1,6 @@
 {
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "projectname": "jiancaiPro",
+  "projectname": "mp-weixin",
   "setting": {
     "compileHotReLoad": true
   }