feat: 框架

http/baseApi.js

@@ -1,11 +1,11 @@
 // const BaseApi = 'http://192.168.2.190:8080' //汪瑶
 // const BaseApi = 'http://192.168.2.205:8080' //汪辉
-const BaseApi = 'http://192.168.2.19:8080' //李勇
+// const BaseApi = 'http://192.168.2.19:8080' //李勇
 // const BaseApi = 'http://192.168.3.13:8080' //徐涛
 // const BaseApi = 'http://192.168.2.39:8080' //肖添伟
 // const BaseApi = 'http://192.168.3.6:8080' //朱壮波
 
-// const BaseApi = 'https://i.ringzle.com/island-cloud-server' //测试服务器
+const BaseApi = 'https://i.ringzle.com/island-cloud-server' //测试服务器
 
 export {
 	BaseApi

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "hotelHomestay",
-    "appid" : "__UNI__131ABEA",
+    "appid" : "__UNI__3A1C8AF",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

pagesHouse/Mine/Businesses/Businesses.vue

@@ -20,7 +20,8 @@
 					商户类型
 				</view>
 				<view class="">
-					<u-icon name="arrow-right"></u-icon>
+					渔家乐
+					<!-- <u-icon name="arrow-right"></u-icon> -->
 				</view>
 			</view>
 			<view class="one-mobile">
@@ -37,7 +38,8 @@
 					企业类型
 				</view>
 				<view class="">
-					<u-icon name="arrow-right"></u-icon>
+					<!-- <u-icon name="arrow-right"></u-icon> -->
+					渔家乐
 				</view>
 			</view>
 
@@ -134,6 +136,29 @@
 
 			</view>
 		</view>
+		<!-- 选择弹框学历要求 -->
+		<u-popup :show="showTwo" @close="close" :round="24" @open="open">
+			<view class="pop">
+				<view class="hander">
+					<view class="left" @click="showTwo=false">
+						取消
+					</view>
+					<view class="center">
+						<!-- 学历要求 -->
+					</view>
+					<view class="right" @click="showTwo=false">
+						确定
+					</view>
+				</view>
+
+				<view class="At-last" v-for="item,index in JobList">
+					<view class="item" @click="choose(item,index)" :class="indexDb==index?'activeItem':''">
+						{{item.name}}
+					</view>
+				</view>
+
+			</view>
+		</u-popup>
 
 		<view class="from-content">
 			<button class="tenant-button">
@@ -151,6 +176,24 @@
 				mt: uni.getSystemInfoSync().statusBarHeight + 44,
 				titleHeader: '个人信息',
 				fileList: [],
+				JobList: [{
+						name: '不限'
+					}, {
+						name: '高中',
+					},
+					{
+						name: '中专/技校',
+					},
+					{
+						name: '大专',
+					},
+					{
+						name: '本科',
+					},
+					{
+						name: '硕士',
+					}
+				],
 				dto: {
 					realName: '黄沙村渔家乐', //昵称
 					modifyPhone: '18755113256', //手机号

pagesHouse/Mine/index.vue

@@ -62,11 +62,11 @@
 						<view class="demo-layout bg-purple-light">
 							<view class="one2">
 								<!-- {{myList.islandName}} -->
-								黄沙村渔家乐
+								{{merchantName}}
 							</view>
 							<view class="two2">
 								<!-- {{myList.areaDetail}} -->
-								舟山市嵊泗县嵊山镇前卫村后岗
+								<!-- 舟山市嵊泗县嵊山镇前卫村后岗 -->
 							</view>
 						</view>
 					</u-col>
@@ -96,12 +96,12 @@
 				name: '游客',
 				orderMenus: [ //type:1 待付款、2 待使用、3 待评价、4 退款/售后
 					{
-						type: 1,
+						type: 0,
 						img: 'https://i.ringzle.com/file/20240129/818fa751cf8d4772ac1cf818522a7f54.png',
 						text: '待付款'
 					},
 					{
-						type: 2,
+						type: 4,
 						img: 'https://i.ringzle.com/file/20240129/c4ef5f92f5274dbe9e281ad509571fc3.png',
 						text: '待使用'
 					},
@@ -111,17 +111,19 @@
 						text: '已完成'
 					},
 					{
-						type: 4,
+						type: -3,
 						img: 'https://i.ringzle.com/file/20240129/f3fd049aaffb4768aa115572851a2bb1.png',
 						text: '退款/售后'
 					}
 				],
 				price: 0, //钱包余额
+				merchantName: uni.getStorageSync('merchantName'),
 			}
 		},
 		methods: {
 			toTurn(url, login) { //login 是否需要验证登录跳转
 				if (!url) return this.$showToast('正在开发中...')
+				console.log(url);
 				uni.navigateTo({
 					url
 				});

pagesHouse/Mine/ordersList/index.vue

@@ -112,10 +112,23 @@
 			}
 		},
 		onLoad(option) {
-			if (option.Type) {
-				const type = parseInt(option.Type)
-				this.changeTab1(type)
+			console.log(option.type);
+			if (option.type) {
+				console.log('1111');
+				const type = parseInt(option.type)
+
+				if (type == 0) {
+					this.changeTab1(1)
+				} else if (type == 4) {
+					this.changeTab1(2)
+				} else if (type == 3) {
+					this.changeTab1(3)
+				} else if (type == -3) {
+					this.changeTab1(4)
+				}
+				this.getOrderList()
 			} else {
+				console.log('2222');
 				this.getOrderList()
 			}
 		},

pagesHouse/Verification/index.vue

@@ -36,7 +36,7 @@
 		methods: {
 			// 扫码
 			SweepIt() {
-
+				this.$showToast('正在开发中...');
 			},
 			// 手工
 			handiwork() {