冲突

components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.vue

@@ -12,12 +12,12 @@
 			<scroll-view :scroll-top="scrollRightTop" scroll-y scroll-with-animation :style="[menuRight]"
 				@scroll="rightScroll">
 				<view class="menu_right_view">
-	<!-- 				<view class="menu_right_item" :id="'item' + index" v-for="(item , index) in tabbar" :key="index">
+					<view class="menu_right_item" :id="'item' + index" v-for="(item , index) in tabbar" :key="index">
 						<view class="menu_right_title">{{item[keyName]}}</view>
 						<view class="">
-							<slot :scroll_list='item[tabbarName]'></slot>
+							<slot :scroll_list='item[tabbarName]' :language='language'></slot>
 						</view>
-					</view> -->
+					</view>
 				</view>
 			</scroll-view>
 		</view>
@@ -104,9 +104,13 @@
 				arr: [], //左侧菜单距离登录距离列表
 				scrollRightTop: 0, // 右边栏目scroll-view的滚动条高度
 				timer: null, // 定时器
+				language: ''
 			}
 		},
 		mounted() {
+			if (uni.getStorageSync('language')) {
+				this.language = uni.getStorageSync('language')
+			}
 			this.getMenuItemTop()
 		},
 		methods: {

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "kjds",
-    "appid" : "__UNI__F715804",
+    "appid" : "__UNI__AF78173",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

pageA/payorder.vue

@@ -199,7 +199,6 @@
 			},
 			confirm() {
 				// console.log(new Date().getTime());
-
 				if (this.type == "") {
 					uni.$u.http
 						.post("/api/order/payment", {
@@ -208,24 +207,35 @@
 							customer_currency: "RMB",
 						})
 						.then((res) => {
-							uni.navigateTo({
-								url: "confirm",
-							});
+							console.log(res);
 							if (this.pay_type == "wechat") {
 								uni.requestPayment({
-									provider: "wxpay",
-									package: `prepay_id=${res.prepay_id}`,
-									// prepay_id: res.prepay_id,
-									signType: res.prepay_id,
-									paySign: res.prepay_id,
-									timeStamp: String(new Date().getTime()),
-									nonceStr: res.prepay_id,
-									success: (result) => {
-										console.log(result);
-									},
-									fail: (error) => {
-										console.log(error);
+									provider: 'wxpay',
+									timeStamp: String(res.timeStamp),
+									nonceStr: res.nonceStr,
+									package: res.package,
+									signType: res.signType,
+									paySign: res.paySign,
+									success: function(res) {
+										this.$u.toast('支付成功')
+										console.log('success:' + JSON.stringify(res));
+										setTimeout(() => {
+												// uni.navigateTo({
+												// 	url: "confirm",
+												// });
+										}, 800);
 									},
+									fail: function(err) {
+										console.log('fail:' + JSON.stringify(err));
+									}
+									// success: (result) => {
+									// 	
+									// 	// console.log(result);
+
+									// },
+									// fail: (error) => {
+									// 	console.log(error);
+									// },
 								});
 							}
 						})
@@ -259,7 +269,7 @@
 										console.log('fail:' + JSON.stringify(err));
 									}
 								});
-							}else{
+							} else {
 								this.$u.toast('支付成功')
 								setTimeout(() => {
 									uni.switchTab({

pageA/shoplist.vue

@@ -27,44 +27,63 @@
 					<image v-else src="static/images/shaixuan.png" style="width: 24rpx;height: 24rpx;" mode=""></image>
 				</view>
 			</view>
+
 			<liu-waterfall :dataList="data" :column="columns" @click="detail"></liu-waterfall>
 			<view class="pop" style="position: absolute;top:80rpx" v-if="shai&&current==4">
+				<!-- 价格区间 -->
 				<view class=" title">{{i18n.Pricerange}}</view>
 				<view class="u-flex u-row-between">
 					<view class="input u-flex u-row-center">
-						<input style="text-align: center;" type="text" :placeholder="i18n.Bottomprice" />
+						<input style="text-align: center;" type="text" :placeholder="i18n.Bottomprice"
+							v-model="price_range_start" />
 					</view>
 					<text>-</text>
 					<view class="input u-flex u-row-center">
-						<input style="text-align: center;" type="text" :placeholder="i18n.highestprice" />
+						<input style="text-align: center;" type="text" :placeholder="i18n.highestprice"
+							v-model="price_range_end" />
 					</view>
 				</view>
+				<!-- 重量区间 -->
 				<view class="title" style="margin-top: 36rpx;">{{i18n.Weightinterval}}</view>
 				<view class="u-flex u-row-between">
 					<view class="input u-flex u-row-center">
-						<input style="text-align: center;" type="text" :placeholder="i18n.Bottomprice" />
+						<input style="text-align: center;" type="text" :placeholder="i18n.Bottomprice"
+							v-model="weight_range_start" />
 					</view>
 					<text>-</text>
 					<view class="input u-flex u-row-center">
-						<input style="text-align: center;" type="text" :placeholder="i18n.highestprice" />
+						<input style="text-align: center;" type="text" :placeholder="i18n.highestprice"
+							v-model="weight_range_end" />
 					</view>
 				</view>
+				<!-- 品牌 -->
 				<view style="margin-top: 36rpx;" class="title">{{i18n.brand}}</view>
 				<view class="u-flex " style="flex-wrap: wrap;column-gap: 34rpx;">
-					<view @click="changei(idx)" class="item" v-for="(item,idx) in 8" :key="idx"
-						:class="index==idx?'acitem':'item'">
-						PURICH/醇粹
+					<view @click="changei(item,idx)" v-for="(item,idx) in brandlist" :key="idx">
+						<view :class="index==idx?'acitem':'item'" class="" v-if="language =='zh-CN'">
+							{{item.name_cn}}
+						</view>
+						<view :class="index==idx?'acitem':'item'" class="" v-if="language =='en-US'">
+							{{item.name_en}}
+						</view>
+						<view :class="index==idx?'acitem':'item'" class="" v-if="language =='es-ES'">
+							{{item.name_es}}
+						</view>
+						<view :class="index==idx?'acitem':'item'" class="" v-if="language =='it-IT'">
+							{{item.name_ita}}
+						</view>
 					</view>
 				</view>
 				<view style="margin-top: 36rpx;" class="title">{{i18n.Proprietary}}</view>
-				<view class="item">
+				<view :class="yes==true?'acitem':'item'" @click="yesa">
+					<!-- {{yes}} -->
 					{{i18n.yes}}
 				</view>
 				<view class="bottom u-flex" style="margin-top: 58rpx;">
 					<view class="btn1">
 						{{i18n.reset}}
 					</view>
-					<view class="btn2" @click="shai=false">
+					<view class="btn2" @click="enter">
 						{{i18n.enter}}
 					</view>
 				</view>
@@ -77,6 +96,7 @@
 	export default {
 		data() {
 			return {
+				yes: false,
 				shai: false,
 				current: 0,
 				curess: 0,
@@ -87,16 +107,22 @@
 				goodsid: '',
 				title: '',
 				parent_id: '',
-				language:'',
-				page:1,
-				
+				language: '',
+				page: 1,
+				weight_range_start: '', //重量区间 start
+				weight_range_end: '', //重量区间 end
+				brand_id: '', //品牌id
+				price_range_start: '', //价格区间
+				price_range_end: '', //价格区间
+				brandlist: []
 			};
 		},
 		onLoad(options) {
-			console.log(options);
 			this.goodsid = options.id
 			this.title = options.title
 			this.parent_id = options.parent_id
+			this.curess = options.index
+			console.log(options.index);
 		},
 		onShow() {
 			uni.setNavigationBarTitle({
@@ -107,6 +133,7 @@
 			if (uni.getStorageSync('language') != '') {
 				this.language = uni.getStorageSync('language')
 			}
+			this.brand()
 		},
 		computed: {
 			i18n() {
@@ -114,11 +141,19 @@
 			}
 		},
 		methods: {
+			enter() {
+				this.shai = false
+				this.goods(this.goodsid)
+			},
+
+			yesa() {
+				this.yes = !this.yes
+			},
 			//商品详情
-			detail(item){
+			detail(item) {
 				console.log(item);
 				uni.navigateTo({
-					url:'/pageA/productdetails?id='+item.id
+					url: '/pageA/productdetails?id=' + item.id
 				})
 			},
 			//商品分类
@@ -126,8 +161,8 @@
 				uni.$u.http.get('/api/goods/category', {
 					params: {
 						parent_id: id,
-						limit:10,
-						page:this.page
+						limit: 10,
+						page: this.page
 					}
 				}).then((res) => {
 					const categoryArr = res
@@ -152,7 +187,7 @@
 							item.name = item.name_cn
 						})
 					}
-					this.list1 = categoryArr
+					this.list1 = categoryArr.reverse()
 				}).catch(() => {
 
 				})
@@ -161,7 +196,14 @@
 			goods(id) {
 				uni.$u.http.get('/api/goods', {
 					params: {
-						category_id: id
+						category_id: id,
+						limit: 10,
+						page: this.page,
+						weight_range_start: this.weight_range_start,
+						weight_range_end: this.weight_range_end,
+						brand_id: this.brand_id,
+						price_range_start: this.price_range_start,
+						price_range_end: this.price_range_end
 					}
 				}).then((res) => {
 					this.data = res.data
@@ -169,6 +211,17 @@
 
 				})
 			},
+			//品牌列表
+			brand(id) {
+				uni.$u.http.get('/api/goods/brand', {
+					params: {}
+				}).then((res) => {
+					console.log(res);
+					this.brandlist = res
+				}).catch(() => {
+
+				})
+			},
 			shaixuan() {
 				this.shai = true,
 					this.current = 4
@@ -176,12 +229,32 @@
 			click(item) {
 				console.log('item', item);
 				this.curess = item.index
+				this.title = item.title
 				this.goods(item.id)
-				// uni.navigateTo({
-				// 	url: '/pageB/delivery'
-				// })
+				if (this.language == 'en-US') {
+					uni.setNavigationBarTitle({
+						title: item.name_en
+					})
+				}
+				if (this.language == 'es-ES') {
+					uni.setNavigationBarTitle({
+						title: item.name_es
+					})
+				}
+				if (this.language == 'it-IT') {
+					uni.setNavigationBarTitle({
+						title: item.name_ita
+					})
+				}
+
+				if (this.language == 'zh-CN') {
+					uni.setNavigationBarTitle({
+						title: item.name_cn
+					})
+				}
 			},
-			changei(idx) {
+			changei(item,idx) {
+				this.brand_id = item.id
 				this.index = idx
 			}
 		}
@@ -256,6 +329,7 @@
 			height: 64rpx;
 			font-family: PingFangSC, PingFang SC;
 			font-weight: 400;
+			border-radius: 36rpx;
 			font-size: 24rpx;
 			color: rgba(248, 50, 36, 1);
 			line-height: 64rpx;

pageA/shoptype.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="">
 		<zhSlidingMenu ref='zhSlidingMenu' :tabbar='list' :scrollH="scrollH">
-			<template #default="{scroll_list}">
+			<template #default="{scroll_list,language}">
 				<view class="goods">
 					<view class="goods_item" v-for="(item, index) in scroll_list" :key="index"
-						@click="clickGoods(item)">
+						@click="clickGoods(item,index)">
 						<image class="goods_item_img" :src="item.image" mode=""></image>
 						<view class="goods_item_name" v-if="language =='zh-CN'">
 							{{item.name_cn}}
@@ -34,54 +34,54 @@
 		data() {
 			return {
 				scrollH: 0, //scroll高度
-				// list: [{
-				// 		name: "女装",
-				// 		children: [{
-				// 				name: "A字裙",
-				// 				icon: "https://cdn.uviewui.com/uview/common/classify/1/1.jpg",
-				// 			},
-				// 			{
-				// 				name: "礼服/婚纱",
-				// 				icon: "https://cdn.uviewui.com/uview/common/classify/1/14.jpg",
-				// 			}
-				// 		]
-				// 	},
-				// 	{
-				// 		name: "美食",
-				// 		children: [{
-				// 				name: "火锅",
-				// 				icon: "https://cdn.uviewui.com/uview/common/classify/2/1.jpg",
-				// 			},
-				// 			{
-				// 				name: "精品茗茶",
-				// 				icon: "https://cdn.uviewui.com/uview/common/classify/2/7.jpg",
-				// 			},
-				// 			{
-				// 				name: "休闲食品",
-				// 				icon: "https://cdn.uviewui.com/uview/common/classify/2/8.jpg",
-				// 			},
-				// 		]
-				// 	},
-				// 	{
-				// 		name: "美妆",
-				// 		children: [{
-				// 				name: "化妆刷",
-				// 				icon: "https://cdn.uviewui.com/uview/common/classify/3/1.jpg",
-				// 			},
-				// 			{
-				// 				name: "防晒品",
-				// 				icon: "https://cdn.uviewui.com/uview/common/classify/3/14.jpg",
-				// 			},
-				// 			{
-				// 				name: "美甲",
-				// 				icon: "https://cdn.uviewui.com/uview/common/classify/3/15.jpg",
-				// 			}
+				list1: [{
+						name: "女装",
+						children: [{
+								name: "A字裙",
+								icon: "https://cdn.uviewui.com/uview/common/classify/1/1.jpg",
+							},
+							{
+								name: "礼服/婚纱",
+								icon: "https://cdn.uviewui.com/uview/common/classify/1/14.jpg",
+							}
+						]
+					},
+					{
+						name: "美食",
+						children: [{
+								name: "火锅",
+								icon: "https://cdn.uviewui.com/uview/common/classify/2/1.jpg",
+							},
+							{
+								name: "精品茗茶",
+								icon: "https://cdn.uviewui.com/uview/common/classify/2/7.jpg",
+							},
+							{
+								name: "休闲食品",
+								icon: "https://cdn.uviewui.com/uview/common/classify/2/8.jpg",
+							},
+						]
+					},
+					{
+						name: "美妆",
+						children: [{
+								name: "化妆刷",
+								icon: "https://cdn.uviewui.com/uview/common/classify/3/1.jpg",
+							},
+							{
+								name: "防晒品",
+								icon: "https://cdn.uviewui.com/uview/common/classify/3/14.jpg",
+							},
+							{
+								name: "美甲",
+								icon: "https://cdn.uviewui.com/uview/common/classify/3/15.jpg",
+							}
 
-				// 		]
-				// 	}
-				// ],
-				language: '',
-				list:[]
+						]
+					}
+				],
+				language: 'zh-CN',
+				list: []
 			}
 		},
 		onLoad() {
@@ -90,6 +90,9 @@
 					this.scrollH = res.windowHeight
 				}
 			});
+			if (uni.getStorageSync('language')) {
+				this.language = uni.getStorageSync('language')
+			}
 		},
 		computed: {
 			i18n() {
@@ -100,36 +103,35 @@
 			uni.setNavigationBarTitle({
 				title: this.i18n.classification
 			})
+
 			this.category() //商品分类
-			if (uni.getStorageSync('language') != '') {
-				this.language = uni.getStorageSync('language')
-			}
+			console.log(this.language);
 		},
 		methods: {
-			clickGoods(item) { //点击商品
+			clickGoods(item, index) { //点击商品
 				console.log(item);
 				if (this.language == 'en-US') {
 					uni.navigateTo({
 						url: '/pageA/shoplist?id=' + item.id + '&title=' + item.name_en + '&parent_id=' + item
-							.parent_id
+							.parent_id + "&index=" + index
 					})
 				}
 				if (this.language == 'es-ES') {
 					uni.navigateTo({
 						url: '/pageA/shoplist?id=' + item.id + '&title=' + item.name_es + '&parent_id=' + item
-							.parent_id
+							.parent_id + "&index=" + index
 					})
 				}
 				if (this.language == 'it-IT') {
 					uni.navigateTo({
 						url: '/pageA/shoplist?id=' + item.id + '&title=' + item.name_ita + '&parent_id=' + item
-							.parent_id
+							.parent_id + "&index=" + index
 					})
 				}
 				if (this.language == 'zh-CN') {
 					uni.navigateTo({
 						url: '/pageA/shoplist?id=' + item.id + '&title=' + item.name_cn + '&parent_id=' + item
-							.parent_id
+							.parent_id + "&index=" + index
 					})
 				}
 			},

pageA/subsidy.vue

@@ -121,9 +121,30 @@
 				Pleaseproductname: '', //搜索内容
 				language: 'zh-CN', //语言
 				keyword: '',
-				parent_id: ''
+				parent_id: '',
+				page: 1,
+				limit: 10,
+				last_page: 1,
 			};
 		},
+		onReachBottom() {
+			if (this.page < this.last_page) {
+				// if (this.current != 0) {
+				this.page++
+				if (this.show == 1) {
+					this.subsid() //百万补贴
+				}
+				if (this.show == 2) {
+					this.pack() //拼包好物
+				}
+				if (this.show == 3) {
+					this.shipp() //海外包邮
+				}
+				// }
+			} else {
+				this.$u.toast('已无更多数据')
+			}
+		},
 		computed: {
 			i18n() {
 				return this.$t('index')
@@ -228,10 +249,17 @@
 			//海外包邮接口
 			shipp(id) {
 				uni.$u.http.post('api/goods/shipping', {
+					page: this.page,
+					limit: this.limit,
 					parent_id: id,
 					keyword: this.keyword
 				}).then((res) => {
-					this.list = res.data
+					this.last_page = res.last_page
+					if (this.page == 1) {
+						this.list = res.data
+					} else {
+						this.list = this.list.concat(res.data)
+					}
 				}).catch(() => {
 
 				})
@@ -239,10 +267,17 @@
 			//拼包好物接口
 			pack(id) {
 				uni.$u.http.post('/api/goods/pack', {
+					page: this.page,
+					limit: this.limit,
 					parent_id: id,
 					keyword: this.keyword
 				}).then((res) => {
-					this.list = res.data
+					this.last_page = res.last_page
+					if (this.page == 1) {
+						this.list = res.data
+					} else {
+						this.list = this.list.concat(res.data)
+					}
 				}).catch(() => {
 
 				})
@@ -250,10 +285,17 @@
 			//百万补贴接口
 			subsid(id) {
 				uni.$u.http.post('/api/goods/subsidy', {
+					page: this.page,
+					limit: this.limit,
 					parent_id: id,
 					keyword: this.keyword
 				}).then((res) => {
-					this.list = res.data
+					this.last_page = res.last_page
+					if (this.page == 1) {
+						this.list = res.data
+					} else {
+						this.list = this.list.concat(res.data)
+					}
 				}).catch(() => {
 
 				})

pages/index/index.vue

@@ -525,6 +525,10 @@
 	}
 
 	.shopname {
+		width: 124rpx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 400;
 		font-size: 20rpx;

pages/login/login.vue

@@ -23,156 +23,175 @@
       微信授权登录
     </button>
 
-    <view>
-      <u--input
-        placeholder="请输入内容"
-        border="surround"
-        v-model="mobile"
-      ></u--input>
-      <u--input
-        placeholder="请输入内容"
-        border="surround"
-        v-model="code"
-      ></u--input>
-    </view>
-    <button @click="submit">登录</button>
-    <view class="" style="margin-top: 42rpx; display: flex">
-      <u-checkbox-group
-        v-model="checkboxValue1"
-        placement="column"
-        @change="checkboxChange"
-      >
-        <u-checkbox
-          shape="circle"
-          :customStyle="{ marginBottom: '8px' }"
-          :name="1"
-        >
-        </u-checkbox>
-      </u-checkbox-group>
-      <text class="fontYin">我已阅读并同意</text>
-      <text class="fontYin" style="color: #f83224">《用户协议》</text>
-      <text class="fontYin">和</text>
-      <text class="fontYin" style="color: #f83224">《隐私协议》</text>
-    </view>
-  </view>
+
+		<view>
+			<u--input placeholder="请输入内容" border="surround" v-model="mobile"></u--input>
+			<u--input placeholder="请输入内容" border="surround" v-model="code"></u--input>
+		</view>
+		<button @click="submit">登录</button>
+		<button @click="submita">注册</button>
+		<view class="" style="margin-top: 42rpx; display: flex">
+			<u-checkbox-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
+				<u-checkbox shape="circle" :customStyle="{ marginBottom: '8px' }" :name="1">
+				</u-checkbox>
+			</u-checkbox-group>
+			<text class="fontYin">我已阅读并同意</text>
+			<text class="fontYin" style="color: #f83224">《用户协议》</text>
+			<text class="fontYin">和</text>
+			<text class="fontYin" style="color: #f83224">《隐私协议》</text>
+		</view>
+	</view>
 </template>
 
 <script>
-import { login } from "../../network/api/homeApi.js";
-export default {
-  data() {
-    return {
-      mobile: "",
-      code: "",
-      checkboxValue1: false,
-      changea: [],
-    };
-  },
-  methods: {
-    //微信登录
-    tologin(e) {
-      if (this.changea.length > 0) {
-        if (e.detail.code) {
-          var phoneCode = e.detail.code;
-          uni.login({
-            success: (code) => {
-              uni.$u.http
-                .post("/api/wxmini/login", {
-                  code: code.code,
-                })
-                .then((res) => {
-                  console.log(res);
-                  if (res == 10011) {
-                    uni.$u.http
-                      .post("/api/wxmini/mobile", {
-                        code: phoneCode,
-                      })
-                      .then((res) => {
-                        uni.$u.http
-                          .post("/api/register", {
-                            wx_code: code.code, //		是	String	微信登录时候的code
-                            mobile: res.mobile, //	是	String	手机号码
-                          })
-                          .then((res) => {
-                            console.log(res);
-                            uni.setStorageSync("token", res.token);
-                            uni.setStorageSync("openid", res.openid);
-                            setTimeout(() => {
-                              uni.navigateTo({
-                                url: "/pageA/changelange",
-                              });
-                            }, 300);
-                          })
-                          .catch(() => {});
-                      })
-                      .catch(() => {});
-                  } else {
-                    uni.setStorageSync("token", res.token);
-                    uni.setStorageSync("openid", res.openid);
-                    setTimeout(() => {
-                      uni.navigateTo({
-                        url: "/pageA/changelange",
-                      });
-                    }, 300);
-                  }
-                })
-                .catch(() => {});
-            },
-          });
-        }
-      } else {
-        this.$u.toast("请勾选隐私协议");
-      }
-    },
-    checkboxChange(n) {
-      console.log("change", n);
-      this.changea = n;
-    },
-    submit() {
-      // login({ mobile: "13000000000", password: "123456" }).then((res) => {
-      //   console.log(res);
-      //   if (res.data.code == 10000) {
-      //     uni.setStorage({
-      //       key: "token",
-      //       data: res.data.data.token,
-      //       success: function () {
-      //         uni.switchTab({
-      //           url: "../index/index",
-      //         });
-      //       },
-      //     });
-      //   }
-      // });
-      uni.$u.http
-        .post("/api/login", {
-          mobile: this.mobile,
-          password: "123456",
-        })
-        .then((res) => {
-          uni.setStorageSync("token", res.token);
-          uni.switchTab({
-            url: "/pages/index/index",
-          });
-        })
-        .catch((error) => {
-          console.log(error);
-        });
-    },
-    submita() {
-      uni.$u.http
-        .post("/api//mobile-register", {
-          mobile: this.mobile,
-          password: "123456",
-        })
-        .then((res) => {
-          uni.$u.toast("注册成功");
-        })
-        .catch((error) => {
-          console.log(error);
-        });
-    },
-  },
-};
+	// import {conn} from '@/utils/WebIM.js'
+	import {conn} from '../../utils/WebIM.js'
+	import {
+		login
+	} from "../../network/api/homeApi.js";
+	export default {
+		data() {
+			return {
+				mobile: "",
+				code: "",
+				checkboxValue1: false,
+				changea: [],
+			};
+		},
+		methods: {
+			//微信登录
+			tologin(e) {
+				if (this.changea.length > 0) {
+					if (e.detail.code) {
+						var phoneCode = e.detail.code;
+						uni.login({
+							success: (code) => {
+								uni.$u.http
+									.post("/api/wxmini/login", {
+										code: code.code,
+									})  
+									.then((res) => {
+										console.log(res);
+										if (res == 10011) {
+											uni.$u.http
+												.post("/api/wxmini/mobile", {
+													code: phoneCode,
+												})
+												.then((res) => {
+													uni.$u.http
+														.post("/api/register", {
+															wx_code: code
+																.code, //		是	String	微信登录时候的code
+															mobile: res.mobile, //	是	String	手机号码
+														})
+														.then((res) => {
+															console.log(res);
+															uni.setStorageSync('user_no',res.easemob_username)
+															uni.setStorageSync('pwd',res.easemob_password)
+															var options = {
+															  user: res.easemob_username,
+															  pwd: res.easemob_password,
+															  appKey: conn.appkey,
+															  success: function (res2) {
+																								
+															  },
+															  error: function(){
+															  }
+															};
+															conn.open(options);
+															uni.setStorageSync("token", res.token);
+															uni.setStorageSync("openid", res
+																.openid);
+															setTimeout(() => {
+																uni.navigateTo({
+																	url: "/pageA/changelange",
+																});
+															}, 300);
+														})
+														.catch(() => {});
+												})
+												.catch(() => {});
+										} else {
+											uni.setStorageSync("token", res.token);
+											uni.setStorageSync("openid", res.openid);
+											setTimeout(() => {
+												uni.navigateTo({
+													url: "/pageA/changelange",
+												});
+											}, 300);
+										}
+									})
+									.catch(() => {});
+							},
+						});
+					}
+				} else {
+					this.$u.toast("请勾选隐私协议");
+				}
+			},
+			checkboxChange(n) {
+				console.log("change", n);
+				this.changea = n;
+			},
+			submit() {
+				// login({ mobile: "13000000000", password: "123456" }).then((res) => {
+				//   console.log(res);
+				//   if (res.data.code == 10000) {
+				//     uni.setStorage({
+				//       key: "token",
+				//       data: res.data.data.token,
+				//       success: function () {
+				//         uni.switchTab({
+				//           url: "../index/index",
+				//         });
+				//       },
+				//     });
+				//   }
+				// });
+				uni.$u.http
+					.post("/api/login", {
+						mobile: this.mobile,
+						password: '123456',
+					})
+					.then((res) => {
+						uni.setStorageSync("token", res.token);
+						uni.setStorageSync('user_no',res.easemob_username)
+						uni.setStorageSync('pwd',res.easemob_password)
+						var options = {
+						  user: res.easemob_username,
+						  pwd: res.easemob_password,
+						  appKey: conn.appkey,
+						  success: function (res2) {
+								console.log(res2);							
+						  },
+						  error: function(){
+						  }
+						};
+						conn.open(options);
+						uni.switchTab({
+							url: "/pages/index/index",
+						});
+					})
+					.catch((error) => {
+						console.log(error);
+					});
+			},
+			submita() {
+				uni.$u.http
+					.post("/api//mobile-register", {
+						mobile: this.mobile,
+						password: '123456',
+					})
+					.then((res) => {
+						uni.$u.toast('注册成功')
+					})
+					.catch((error) => {
+						console.log(error);
+					});
+			}
+		},
+	};
+
 </script>
 
 <style lang="scss" scoped>

unpackage/cache/appleConfig.ini

@@ -0,0 +1,17 @@
+[appleAppid]
+appleAppid=com.yixiang.vr
+
+[iosStyle]
+iosStyle=
+
+[universalLinks]
+universalLinks=
+spaceid=
+
+[universalLinks_qq]
+universalLinks_qq=
+spaceid_qq=
+
+[universalLinks_weibo]
+universalLinks_weibo=
+spaceid_weibo=

unpackage/cache/certdataios

@@ -0,0 +1,3 @@
+iosProfile=C:/Users/Administrator/Desktop/vr (1).mobileprovision
+ioscertFile=C:/Users/Administrator/Desktop/忆象开发证书.p12
+ioscertPassword=ep/Tdjka4Y7WYqDB6/S7dw==

unpackage/dist/build/app-plus/__uniappview.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+  <head>
+    <meta charset="UTF-8" />
+    <script>
+      var __UniViewStartTime__ = Date.now();
+      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+        CSS.supports('top: constant(a)'))
+      document.write(
+        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+    </script>
+    <title>View</title>
+    <link rel="stylesheet" href="view.css" />
+  </head>
+
+  <body>
+    <div id="app"></div>
+    <script src="__uniappes6.js"></script>
+    <script src="view.umd.min.js"></script>
+    <script src="app-view.js"></script>
+  </body>
+
+</html>

unpackage/dist/build/app-plus/app-config.js

@@ -0,0 +1 @@
+(function(e){function r(r){for(var n,l,i=r[0],p=r[1],a=r[2],c=0,s=[];c<i.length;c++)l=i[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in p)Object.prototype.hasOwnProperty.call(p,n)&&(e[n]=p[n]);f&&f(r);while(s.length)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var p=t[i];0!==o[p]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={"app-config":0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e["default"]}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var i=this["webpackJsonp"]=this["webpackJsonp"]||[],p=i.push.bind(i);i.push=r,i=i.slice();for(var a=0;a<i.length;a++)r(i[a]);var f=p;t()})([]);