fix:修改默认首页地址改为home页面

http/api.js

@@ -1,3 +1,5 @@
 export default {
   baseUrl: "https://stock.szjixun.cn", //"https://warehouse.szjixun.cn", // https://stock.szjixun.cn
+  // baseUrl: "http://192.168.88.58:9021",
+  // baseUrl: "https://warehouse.szjixun.cn",
 };

http/interface.js

@@ -4,8 +4,11 @@
  */
 export default {
   config: {
+    // baseUrl: "http://192.168.88.58:9021",
+    // baseUrl: "https://warehouse.szjixun.cn",
     baseUrl: "https://stock.szjixun.cn", //"http://172.16.100.93:8017", //"http://192.168.88.175:9021",//测试 'https://warehouse.szjixun.cn' 正式 https://stock.szjixun.cn
     header: {
+      "foo": "bar",
       "Content-Type": "application/json;charset=UTF-8",
       // 'Content-Type':'application/x-www-form-urlencoded'
     },

http/login.js

@@ -54,6 +54,47 @@ export const checkFdd = () => {
     method: "POST",
   });
 };
+
+// 获取手机验证码
+export const getTelCaptcha = (data) => {
+  return http.request({
+    url: "/api/v3/send/msg",
+    method: "POST",
+    data,
+  });
+};
+// 校验手机验证码
+export const checkTelCaptcha = (data) => {
+  return http.request({
+    url: "/api/v3/tel/login",
+    method: "POST",
+    data,
+  });
+};
+// 手机号实名注册
+export const phoneRegister = (data) => {
+  return http.request({
+    url: "/api/v3/register",
+    method: "POST",
+    data,
+  });
+};
+//法大大是否验证
+export const checkPhoneFdd = () => {
+  return http.request({
+    url: "/api/v3/fdd/check",
+    method: "POST",
+  });
+};
+//获取openid
+export const getOpenId = (data) => {
+  return http.request({
+    url: "/api/wxuser/get/openid",
+    method: "POST",
+    data,
+  });
+};
+
 export default {
   login,
   getTel,
@@ -61,4 +102,9 @@ export default {
   chenckId,
   fddRealName,
   checkFdd,
+  getTelCaptcha,
+  checkTelCaptcha,
+  phoneRegister,
+  checkPhoneFdd,
+  getOpenId
 };

http/mine.js

@@ -20,15 +20,24 @@ const update = (data) => {
     data,
   });
 };
-const logout = () => {
+// 注销账号
+const signOff = () => {
   return http.request({
     url: "/api/wxuser/remove",
     method: "POST",
   });
 };
+// 退出登录
+const logout = () => {
+  return http.request({
+    url: "/api/v3/logout",
+    method: "POST",
+  });
+}
 export default {
   infoOrders,
   info,
   update,
-  logout,
+  signOff,
+  logout
 };

manifest.json

@@ -64,11 +64,7 @@
             {
                 "root" : "pagesFace",
                 "name" : "pagesFace",
-		      "pages": [
+                "pages" : [ "pages/index/index", "pages/webview/webview", "pages/middle/middle" ]
-		        "pages/index/index",
-        "pages/webview/webview",
-        "pages/middle/middle"
-		      ]
             }
         ]
     },

pages.json

@@ -5,10 +5,18 @@
 		"^tm-(.*)": "@/tm-vuetify/components/tm-$1/tm-$1.vue"
 	},
 	"pages": [
-
+		{
+			"path": "pages/home/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path": "pages/login/login",
 			"style": {
+				"navigationStyle": "custom",
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"app-plus": {
@@ -64,14 +72,6 @@
 				}
 			}
 		},
-		{
-			"path": "pages/home/index",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		},
 		{
 			"path": "pages/contract/index",
 			"style": {

pages/confirm-order/index.vue

@@ -1,11 +1,16 @@
 <template>
 	<div class="order-details">
-    <title-block class="titile-d" :title="type==='detail'?'详情':'确认订单'">
+		<title-block
+			class="titile-d"
+			:title="type === 'detail' ? '详情' : '确认订单'"
+		>
 			<template #left>
 				<div>
-          <image style="width: 112rpx;height: 52rpx"
+					<image
+						style="width: 112rpx; height: 52rpx"
 						src="https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/785cf885-c4c9-44b3-8155-4b39988c7ef8.png"
-                 @click="back"></image>
+						@click="back"
+					></image>
 				</div>
 			</template>
 		</title-block>
@@ -13,51 +18,130 @@
 			<div class="wrap1">*请注意确认寄存结束时间</div>
 			<div class="wrap2">
 				<div class="wrap2_1" :style="{ height: `${listHeight}rpx` }">
-          <div :class="['item',index===currentIndex?'active':'']" @click="itemClick(index)" v-for="(item,index) of listPaintings">
+					<div
+						:class="[
+							'item',
+							index === currentIndex ? 'active' : ''
+						]"
+						@click="itemClick(index)"
+						v-for="(item, index) of listPaintings"
+					>
 						<div class="item_1">{{ index + 1 }}</div>
 						<div class="item_2">
 							<div class="item_2_1">
-                <img :src="listPaintings[index].fileList1[0].url" alt="">
+								<img
+									:src="listPaintings[index].fileList1[0].url"
+									alt=""
+								/>
 							</div>
-              <div class="item_2_2">{{listPaintings[index].artworkNum}}</div>
+							<div class="item_2_2">
+								{{ listPaintings[index].artworkNum }}
+							</div>
+						</div>
+						<div class="item_3">
+							{{ listPaintings[index].artworkName }}
+						</div>
+						<div class="item_4">
+							{{
+								listPaintings[index].warehouseID
+									? addressList.find(
+											(x) =>
+												x.ID ===
+												listPaintings[index].warehouseID
+									  ).address
+									: ''
+							}}
+						</div>
+						<div class="item_5">
+							{{ listPaintings[index].endAt }}
 						</div>
-            <div class="item_3">{{listPaintings[index].artworkName}}</div>
-            <div class="item_4">{{listPaintings[index].warehouseID?addressList.find(x=>x.ID===listPaintings[index].warehouseID).address:''}}</div>
-            <div class="item_5">{{listPaintings[index].endAt}}</div>
 					</div>
 				</div>
 				<div class="wrap2_2" @click="expand">
-          <div class="wrap2_2_1" v-if="listPaintings.length>2" :style="{transform:`${isExpand?'rotate(180deg)':''}`}">
+					<div
-            <img src="https://cdns.fontree.cn/fonchain-main/prod/image/default/approval/13639162-2871-4187-abc5-71c2d9f01ac2.png" alt="">
+						class="wrap2_2_1"
+						v-if="listPaintings.length > 2"
+						:style="{
+							transform: `${isExpand ? 'rotate(180deg)' : ''}`
+						}"
+					>
+						<img
+							src="https://cdns.fontree.cn/fonchain-main/prod/image/default/approval/13639162-2871-4187-abc5-71c2d9f01ac2.png"
+							alt=""
+						/>
 					</div>
-          <div class="wrap2_2_2">共计{{listPaintings.length}}幅画作</div>
+					<div class="wrap2_2_2">
+						共计{{ listPaintings.length }}幅画作
 					</div>
 				</div>
 			</div>
-    <scroll-view class="content-center" :style="{marginTop:`${contentListHeight+10}px`,marginBottom:type==='detail'?'30rpx':'180rpx'}"  @scroll="scrollDetail" :scroll-into-view="scrollId" scroll-y="true">
+		</div>
-      <div class="content-scroll" v-for="(item,index) of listPaintings" :id="`item-${index}`">
+		<scroll-view
+			class="content-center"
+			:style="{
+				marginTop: `${contentListHeight + 10}px`,
+				marginBottom: type === 'detail' ? '30rpx' : '180rpx'
+			}"
+			@scroll="scrollDetail"
+			:scroll-into-view="scrollId"
+			scroll-y="true"
+		>
+			<div
+				class="content-scroll"
+				v-for="(item, index) of listPaintings"
+				:id="`item-${index}`"
+			>
 				<div class="painting-name" v-if="listPaintings.length > 1">
 					<div class="wrap1">画作{{ index + 1 }}：</div>
-          <div class="wrap2" style="display: none" @click="itemDelete">删除</div>
+					<div
+						class="wrap2"
+						style="display: none"
+						@click="itemDelete"
+					>
+						删除
+					</div>
 				</div>
 				<div class="content2">
 					<u-upload
 						:fileList="listPaintings[index].fileList1"
-              @afterRead="(e)=>{afterRead(e,index)}"
+						@afterRead="
-              @delete="(e)=>{deletePic(e,index)}"
+							(e) => {
+								afterRead(e, index)
+							}
+						"
+						@delete="
+							(e) => {
+								deletePic(e, index)
+							}
+						"
 						name="6"
 						multiple
 						:maxCount="1"
 						width="404rpx"
 						height="306rpx"
 					>
-            <div style="width: 404rpx;height: 306rpx;background: #000;border-radius: 20rpx;display: flex;flex-direction: column;align-items: center;justify-content: center">
+						<div
+							style="
+								width: 404rpx;
+								height: 306rpx;
+								background: #000;
+								border-radius: 20rpx;
+								display: flex;
+								flex-direction: column;
+								align-items: center;
+								justify-content: center;
+							"
+						>
 							<div style="margin-bottom: 14rpx">
-                <image style="width: 38.32rpx;height: 38.2rpx" src="../../static/zu142@3x.png"></image>
+								<image
+									style="width: 38.32rpx; height: 38.2rpx"
+									src="../../static/zu142@3x.png"
+								></image>
+							</div>
+							<div style="font-size: 32rpx; color: #fff">
+								上传画作图片
 							</div>
-              <div style="font-size: 32rpx;color: #fff">上传画作图片</div>
 						</div>
-
 					</u-upload>
 				</div>
 				<div class="content3">
@@ -67,7 +151,13 @@
 							<div class="wrap1_1_1">画作编号</div>
 							<div class="wrap1_1_2"></div>
 							<div class="wrap1_1_3">
-                <input style="color: #939393;font-size: 24rpx;" disabled v-model="listPaintings[index].artworkNum"  placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画作编号"/>
+								<input
+									style="color: #939393; font-size: 24rpx"
+									disabled
+									v-model="listPaintings[index].artworkNum"
+									placeholder-style="color: #939393;font-size: 24rpx;"
+									placeholder="请输入画作编号"
+								/>
 							</div>
 							<div class="wrap1_1_4"></div>
 						</div>
@@ -75,7 +165,13 @@
 							<div class="wrap1_1_1">画作名称</div>
 							<div class="wrap1_1_2"></div>
 							<div class="wrap1_1_3">
-                <input style="color: #939393;font-size: 24rpx;" disabled  v-model="listPaintings[index].artworkName" placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画作名称"/>
+								<input
+									style="color: #939393; font-size: 24rpx"
+									disabled
+									v-model="listPaintings[index].artworkName"
+									placeholder-style="color: #939393;font-size: 24rpx;"
+									placeholder="请输入画作名称"
+								/>
 							</div>
 							<div class="wrap1_1_4"></div>
 						</div>
@@ -83,16 +179,29 @@
 							<div class="wrap1_1_1">画家名称</div>
 							<div class="wrap1_1_2"></div>
 							<div class="wrap1_1_3">
-                <input style="color: #939393;font-size: 24rpx;" disabled v-model="listPaintings[index].artistName"   placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画家名称"/>
+								<input
-              </div>
+									style="color: #939393; font-size: 24rpx"
-              <div class="wrap1_1_4">
+									disabled
+									v-model="listPaintings[index].artistName"
+									placeholder-style="color: #939393;font-size: 24rpx;"
+									placeholder="请输入画家名称"
+								/>
 							</div>
+							<div class="wrap1_1_4"></div>
 						</div>
 						<div class="wrap1_1">
 							<div class="wrap1_1_1">画作平尺数</div>
 							<div class="wrap1_1_2"></div>
 							<div class="wrap1_1_3">
-                <input style="color: #939393;font-size: 24rpx;" disabled v-model="listPaintings[index].artworkSquareSize"  placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请输入画作平尺数"/>
+								<input
+									style="color: #939393; font-size: 24rpx"
+									disabled
+									v-model="
+										listPaintings[index].artworkSquareSize
+									"
+									placeholder-style="color: #939393;font-size: 24rpx;"
+									placeholder="请输入画作平尺数"
+								/>
 							</div>
 						</div>
 					</div>
@@ -104,8 +213,22 @@
 							<div class="wrap1_1_1">寄存地址</div>
 							<div class="wrap1_1_2"></div>
 							<div class="wrap1_1_3">
-                <input style="color: #939393;font-size: 24rpx;" disabled :value="listPaintings[index].warehouseID?addressList.find(x=>x.ID===listPaintings[index].warehouseID).address:''"  placeholder-style="color: #939393;font-size: 24rpx;"
+								<input
-                       placeholder="请选择寄存地址"/>
+									style="color: #939393; font-size: 24rpx"
+									disabled
+									:value="
+										listPaintings[index].warehouseID
+											? addressList.find(
+													(x) =>
+														x.ID ===
+														listPaintings[index]
+															.warehouseID
+											  ).address
+											: ''
+									"
+									placeholder-style="color: #939393;font-size: 24rpx;"
+									placeholder="请选择寄存地址"
+								/>
 							</div>
 							<div class="wrap1_1_4"></div>
 							<!--              <div  class="wrap1_1_5">
@@ -116,14 +239,18 @@
 							<div class="wrap1_1_1">寄存时长</div>
 							<div class="wrap1_1_2"></div>
 							<div class="wrap1_1_3">
-                <input style="color: #939393;font-size: 24rpx;" :value="listPaintings[index].endAt" disabled placeholder-style="color: #939393;font-size: 24rpx;" placeholder="请选择寄存时长"/>
+								<input
+									style="color: #939393; font-size: 24rpx"
+									:value="listPaintings[index].endAt"
+									disabled
+									placeholder-style="color: #939393;font-size: 24rpx;"
+									placeholder="请选择寄存时长"
+								/>
 							</div>
 							<!--              <div  class="wrap1_1_5">
                 <image src="../../static/zu612@3x.png"></image>
               </div>-->
-
 						</div>
-
 					</div>
 					<div class="wrap2"></div>
 				</div>
@@ -137,9 +264,12 @@
 			</div>
 		</scroll-view>
 
-
 		<div class="content5" v-if="type !== 'detail'">
-      <div class="wrap4" v-show="isExpand1" :style="{top:`-${152*listPaintings.length}rpx`}">
+			<div
+				class="wrap4"
+				v-show="isExpand1"
+				:style="{ top: `-${152 * listPaintings.length}rpx` }"
+			>
 				<div class="item" v-for="(item, index) in listPaintings">
 					<div class="item_1">{{ index + 1 }}</div>
 					<div class="item_2">{{ item.artworkNum }}</div>
@@ -147,26 +277,54 @@
 					<div class="item_4">¥ {{ item.expectedPayment }}</div>
 				</div>
 			</div>
-      <div class="wrap3" @click="expand1" :style="{transform:`${isExpand1?'':'rotate(180deg)'}`}">  <img src="https://cdns.fontree.cn/fonchain-main/prod/image/default/approval/13639162-2871-4187-abc5-71c2d9f01ac2.png" alt=""></div>
+			<div
+				class="wrap3"
+				@click="expand1"
+				:style="{ transform: `${isExpand1 ? '' : 'rotate(180deg)'}` }"
+			>
+				<img
+					src="https://cdns.fontree.cn/fonchain-main/prod/image/default/approval/13639162-2871-4187-abc5-71c2d9f01ac2.png"
+					alt=""
+				/>
+			</div>
 			<div class="wrap1">
 				<div class="wrap1_1">*仅微信付款</div>
 				<div class="wrap1_2">预计 ¥{{ totalMoney || '0' }}</div>
 			</div>
 			<div class="wrap2" @click="signContract">付款</div>
 		</div>
-    <u-popup :round="15" :show="show_2" mode="bottom"  @open="()=>{show_2=true}">
+		<u-popup
+			:round="15"
+			:show="show_2"
+			mode="bottom"
+			@open="
+				() => {
+					show_2 = true
+				}
+			"
+		>
 			<div class="poup1">
 				<div class="content1">
 					<div class="wrap1">更换您的寄存地址</div>
 					<div @click="show_2 = false" class="wrap2">
 						<image
-                src="https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/d84593b3-10a8-4d86-be8c-b048b03b22c7.png"></image>
+							src="https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/d84593b3-10a8-4d86-be8c-b048b03b22c7.png"
+						></image>
 					</div>
 				</div>
 				<div class="content2"></div>
 				<div class="content3">
-          <div v-for="(item,index) in addressList" @click="selectAddress(item)"
+					<div
-               :class="[listPaintings[currentIndex].warehouseID===item.ID?'active':'']" :key="index" class="wrap1">
+						v-for="(item, index) in addressList"
+						@click="selectAddress(item)"
+						:class="[
+							listPaintings[currentIndex].warehouseID === item.ID
+								? 'active'
+								: ''
+						]"
+						:key="index"
+						class="wrap1"
+					>
 						<div class="wrap1_1">{{ item.address }}</div>
 						<div class="wrap1_2">*剩余{{ item.leftNum }}位置</div>
 					</div>
@@ -246,17 +404,28 @@
             </div>
           </div>
         </u-popup>-->
-    <u-picker :show="show_1" ref="uPicker" :columns="columns" @confirm="confirmDate" @close="show_1=false" @change="changeHandler"></u-picker>
+		<u-picker
-    <u-loading-page bgColor="rgba(0,0,0,0.5)" :loading="loading" loading-text="正在调起微信付款..."></u-loading-page>
+			:show="show_1"
+			ref="uPicker"
+			:columns="columns"
+			@confirm="confirmDate"
+			@close="show_1 = false"
+			@change="changeHandler"
+		></u-picker>
+		<u-loading-page
+			bgColor="rgba(0,0,0,0.5)"
+			:loading="loading"
+			loading-text="正在调起微信付款..."
+		></u-loading-page>
 	</div>
 </template>
 <script>
-import http from "@/http/api";
+import http from '@/http/api'
-import {postDataByParams} from "../../http/service";
+import { postDataByParams } from '../../http/service'
-import {type} from "../../uni_modules/uni-forms/components/uni-forms/utils";
+import { type } from '../../uni_modules/uni-forms/components/uni-forms/utils'
 
 export default {
-  name: "order-details",
+	name: 'order-details',
 	data() {
 		const date = new Date()
 		const years = []
@@ -277,15 +446,10 @@ export default {
 		return {
 			itemHeight: 0,
 			scrollId: 'item-0',
-      columns: [
+			columns: [[180], ['*'], [1, 2, 3, 4, 5], ['='], [180]],
-        [180],
-        ['*'],
-        [1,2,3,4,5],
-        ['='],
-        [180]
-      ],
 			currentIndex: 0,
-      listPaintings:[{
+			listPaintings: [
+				{
 					expectedPayment: '',
 					fileList1: [],
 					artworkNum: '',
@@ -294,7 +458,8 @@ export default {
 					artworkSquareSize: '',
 					warehouseID: '',
 					endAt: ''
-      }],
+				}
+			],
 			contentListHeight: 0,
 			isExpand: false,
 			isExpand1: false,
@@ -324,33 +489,34 @@ export default {
 			day,
 			value: [9999, month - 1, day - 1],
 			visible: true,
-      url: ''
+			url: '',
+			status: 0
 		}
 	},
 	computed: {
 		totalMoney() {
 			return this.listPaintings.reduce((total, item) => {
-        return total + Number(item.expectedPayment);
+				return total + Number(item.expectedPayment)
-      }, 0);
+			}, 0)
 		},
 		currentArtworkSquareSize() {
 			if (
 				this.currentIndex >= 0 &&
 				this.currentIndex < this.listPaintings.length
 			) {
-        return this.listPaintings[this.currentIndex].artworkSquareSize;
+				return this.listPaintings[this.currentIndex].artworkSquareSize
 			}
-      return null;
+			return null
 		},
 		currentEndAt() {
 			if (
 				this.currentIndex >= 0 &&
 				this.currentIndex < this.listPaintings.length
 			) {
-        return this.listPaintings[this.currentIndex].endAt;
+				return this.listPaintings[this.currentIndex].endAt
+			}
+			return null
 		}
-      return null;
-    },
 	},
 	watch: {
 		currentArtworkSquareSize(newValue, oldValue) {
@@ -363,7 +529,7 @@ export default {
 			if (newValue !== oldValue) {
 				this.obtainAmount()
 			}
-    },
+		}
 	},
 	onLoad(load) {
 		if (load.url) {
@@ -386,7 +552,6 @@ export default {
 			})
 		}
 		this.listPaintings = uni.getStorageSync('orderingInfo').listPaintings
-
 	},
 	mounted() {
 		this.getCycle()
@@ -403,21 +568,24 @@ export default {
 	methods: {
 		getElementHeight(selector) {
 			return new Promise((resolve, reject) => {
-        const query = uni.createSelectorQuery();
+				const query = uni.createSelectorQuery()
-        query.select(selector).boundingClientRect(data => {
+				query
+					.select(selector)
+					.boundingClientRect((data) => {
 						if (data) {
-            resolve(data.height); // 成功获取高度时，通过 Promise 返回
+							resolve(data.height) // 成功获取高度时，通过 Promise 返回
 						} else {
-            reject(new Error('无法获取元素高度')); // 如果找不到元素或获取高度失败时，通过 Promise 返回错误
+							reject(new Error('无法获取元素高度')) // 如果找不到元素或获取高度失败时，通过 Promise 返回错误
 						}
-        }).exec();
+					})
-      });
+					.exec()
+			})
 		},
 		async scrollDetail(event) {
-      const scrollTop = event.detail.scrollTop;  // 获取当前滚动位置
+			const scrollTop = event.detail.scrollTop // 获取当前滚动位置
-      const totalHeight = this.listPaintings.length * this.itemHeight;
+			const totalHeight = this.listPaintings.length * this.itemHeight
-      const scrollPercent = (scrollTop / totalHeight) * 100;
+			const scrollPercent = (scrollTop / totalHeight) * 100
-      const index = Math.floor(scrollTop / this.itemHeight); // 计算索引
+			const index = Math.floor(scrollTop / this.itemHeight) // 计算索引
 			/* console.log(`滚动了 ${scrollPercent}%`);
        console.log(`滚动到了第 ${index} 个元素的位置`);*/
 			this.currentIndex = index
@@ -426,7 +594,10 @@ export default {
 			const data1 = {
 				ID: Number(this.$mp.query.ID)
 			}
-      const res1 = await postDataByParams('/api/v2/warehouse/detail', data1)
+			const res1 = await postDataByParams(
+				'/api/v2/warehouse/detail',
+				data1
+			)
 			if (res1.code === 200) {
 				this.info = res1.data
 			}
@@ -440,7 +611,9 @@ export default {
 				picker = this.$refs.uPicker
 			} = e
 			if (columnIndex === 2) {
-        picker.setColumnValues(this.columns.length-1, [this.columns[2][e.index]*this.columns[0][0]])
+				picker.setColumnValues(this.columns.length - 1, [
+					this.columns[2][e.index] * this.columns[0][0]
+				])
 			}
 		},
 		itemDelete() {
@@ -452,8 +625,6 @@ export default {
 			this.$nextTick(() => {
 				this.getheight()
 			})
-
-
 		},
 		itemClick(index) {
 			this.scrollId = `item-${index}`
@@ -476,17 +647,24 @@ export default {
 			this.currentIndex = this.currentIndex + 1
 		},
 		getheight() {
-      let query = uni.createSelectorQuery().in(this);
+			let query = uni.createSelectorQuery().in(this)
-      query.select('.content-list').boundingClientRect(data => {
+			query
+				.select('.content-list')
+				.boundingClientRect((data) => {
 					if (data) {
-          let query = uni.createSelectorQuery().in(this);
+						let query = uni.createSelectorQuery().in(this)
-          query.select('.titile-d').boundingClientRect(data1 => {
+						query
+							.select('.titile-d')
+							.boundingClientRect((data1) => {
 								if (data1) {
-              this.contentListHeight=data.bottom-data1.bottom
+									this.contentListHeight =
+										data.bottom - data1.bottom
 								}
-          }).exec();
+							})
+							.exec()
 					}
-      }).exec();
+				})
+				.exec()
 		},
 		expand1() {
 			this.isExpand1 = !this.isExpand1
@@ -495,29 +673,34 @@ export default {
 			if (this.isExpand) {
 				this.listHeight = 154 * 2
 			} else {
-        this.listHeight=154*(this.listPaintings.length<=7?this.listPaintings.length:7)
+				this.listHeight =
+					154 *
+					(this.listPaintings.length <= 7
+						? this.listPaintings.length
+						: 7)
 			}
 			this.isExpand = !this.isExpand
 		},
 		timestampToDateString(timestamp) {
-      const date = new Date(timestamp ); // 把时间戳乘以1000转换为Date对象需要的毫秒数
+			const date = new Date(timestamp) // 把时间戳乘以1000转换为Date对象需要的毫秒数
-      const year = date.getFullYear();
+			const year = date.getFullYear()
-      const month = ("0" + (date.getMonth() + 1)).slice(-2);     // 月份是从0开始的，所以加1，用slice保证格式是2位数
+			const month = ('0' + (date.getMonth() + 1)).slice(-2) // 月份是从0开始的，所以加1，用slice保证格式是2位数
-      const day = ("0" + date.getDate()).slice(-2);              // 用slice保证格式是2位数
+			const day = ('0' + date.getDate()).slice(-2) // 用slice保证格式是2位数
-      return year + "-" + month + "-" + day;
+			return year + '-' + month + '-' + day
 		},
 		confirmDate(data) {
-      this.listPaintings[this.currentIndex].endAt=data.value[data.value.length-1]
+			this.listPaintings[this.currentIndex].endAt =
+				data.value[data.value.length - 1]
 			this.obtainAmount()
 			this.show_1 = false
 		},
 		openShow1() {
 			if (!this.listPaintings[this.currentIndex].artworkSquareSize) {
 				uni.showToast({
-          title: "请先填写画作平尺数",
+					title: '请先填写画作平尺数',
 					duration: 2000,
-          icon: "none",
+					icon: 'none'
-        });
+				})
 				return
 			}
 			this.show_1 = true
@@ -525,14 +708,14 @@ export default {
 		uploadFilePromise(url, type = null) {
 			return new Promise((resolve) => {
 				uni.uploadFile({
-          url: http.baseUrl + "/api/wxuser/uploadpic",
+					url: http.baseUrl + '/api/wxuser/uploadpic',
 					filePath: url,
-          name: "file",
+					name: 'file',
 					success: (res) => {
-            const { path } = JSON.parse(res.data).data;
+						const { path } = JSON.parse(res.data).data
-            resolve(path);
+						resolve(path)
-          },
+					}
-        });
+				})
 			})
 		},
 		deletePic() {
@@ -551,49 +734,102 @@ export default {
 				})
 			})
 			for (let i = 0; i < lists.length; i++) {
-        const result = await this.uploadFilePromise(lists[i].url, 'check')
+				const result = await this.uploadFilePromise(
+					lists[i].url,
+					'check'
+				)
 				let item = this.listPaintings[index].fileList1[fileListLen]
-        this.listPaintings[index].fileList1.splice(fileListLen, 1, Object.assign(item, {
+				this.listPaintings[index].fileList1.splice(
+					fileListLen,
+					1,
+					Object.assign(item, {
 						status: 'success',
 						message: '',
 						url: result
-        }))
+					})
+				)
 				fileListLen++
 			}
 		},
 		async signContract() {
 			this.loading = true
 			const data1 = {
-        batchId:uni.getStorageSync('orderingInfo').transactionId,
+				batchId: uni.getStorageSync('orderingInfo').transactionId
 			}
-      const res1 = await postDataByParams('/api/v2/warehouse/create',data1)
+			const res1 = await postDataByParams(
+				'/api/v2/warehouse/create',
+				data1
+			)
 			if (res1.code === 200) {
-        const res2 = await postDataByParams('/api/v2/warehouse/paid',{
+				uni.login({
+					provider: 'weixin',
+					success: async ({ code }) => {
+						const res3 = await this.$api.login.getOpenId({ code })
+						if (res3.code === 200) {
+							const res2 = await postDataByParams(
+								'/api/v2/warehouse/paid',
+								{
 									ID: res1.data.ID
-        })
+								}
+							)
 							if (res2.code === 200) {
-          uni.requestPayment({...res2.data,fail:(res)=>{
+								uni.requestPayment({
+									...res2.data,
+									fail: (res) => {
 										this.loading = false
-            },success:()=>{
+									},
+									success: () => {
 										this.loading = false
 										uni.navigateTo({
-                url: `/pages/paySuccess/paySuccess?ID=${res1.data.ID}`,
+											url: `/pages/paySuccess/paySuccess?ID=${res1.data.ID}`
-              });
+										})
-            }})
 									}
+								})
+							} else {
+								this.loading = false
+								this.$common.msgToast(res2.msg)
+							}
+						} else {
+							this.$common.msgToast(res3.msg)
+						}
+					}
+				})
 			}
 		},
 		async obtainAmount() {
-      uni.setStorageSync("endAt",new Date(Date.now() + this.listPaintings[this.currentIndex].endAt * 86400000)?.toISOString()?.slice(0, 10))
+			uni.setStorageSync(
+				'endAt',
+				new Date(
+					Date.now() +
+						this.listPaintings[this.currentIndex].endAt * 86400000
+				)
+					?.toISOString()
+					?.slice(0, 10)
+			)
 			const data = {
 				orders: [
-          {    artworkSquareSize:Number(this.listPaintings[this.currentIndex].artworkSquareSize),
+					{
-            endAt:new Date(Date.now() + this.listPaintings[this.currentIndex].endAt * 86400000)?.toISOString()?.slice(0, 10)}
+						artworkSquareSize: Number(
+							this.listPaintings[this.currentIndex]
+								.artworkSquareSize
+						),
+						endAt: new Date(
+							Date.now() +
+								this.listPaintings[this.currentIndex].endAt *
+									86400000
+						)
+							?.toISOString()
+							?.slice(0, 10)
+					}
 				]
 			}
-      const res = await postDataByParams('/api/v2/warehouse/calculate',data)
+			const res = await postDataByParams(
+				'/api/v2/warehouse/calculate',
+				data
+			)
 			if (res.code === 200) {
-        this.listPaintings[this.currentIndex].expectedPayment=res.data.orders?.[0]?.money
+				this.listPaintings[this.currentIndex].expectedPayment =
+					res.data.orders?.[0]?.money
 			}
 		},
 		confirmCycle() {
@@ -641,7 +877,11 @@ export default {
 			}
 		},
 		changeData(e) {
-      this.data = [e.detail.value[0] + 1990, e.detail.value[1] + 1, e.detail.value[2] + 1]
+			this.data = [
+				e.detail.value[0] + 1990,
+				e.detail.value[1] + 1,
+				e.detail.value[2] + 1
+			]
 		},
 		back() {
 			if (this.type === 'detail') {
@@ -668,7 +908,7 @@ export default {
 	justify-content: center;
 	align-items: center;
 	z-index: -1;
-  background: #A9D897;
+	background: #a9d897;
 	color: #fff;
 	height: 62rpx;
 }
@@ -702,7 +942,7 @@ picker-view {
 }
 
 .order-details {
-  background-image: url("https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/4fdc9a0f-d72a-46b6-a04d-ed56d5465213.png");
+	background-image: url('https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/4fdc9a0f-d72a-46b6-a04d-ed56d5465213.png');
 	box-sizing: border-box;
 	overflow: hidden;
 	padding-left: 30rpx;
@@ -728,7 +968,6 @@ picker-view {
 		.wrap2 {
 			box-sizing: border-box;
 
-
 			border-radius: 20rpx;
 			background-color: #fff;
 			padding-left: 18rpx;
@@ -890,7 +1129,7 @@ picker-view {
 			height: 56rpx;
 			color: #fff;
 			font-size: 32rpx;
-      background: #76C458;
+			background: #76c458;
 		}
 
 		.wrap1 {
@@ -907,7 +1146,7 @@ picker-view {
 
 			.wrap1_2 {
 				font-size: 32rpx;
-        color: #76C458;
+				color: #76c458;
 			}
 		}
 	}
@@ -931,7 +1170,7 @@ picker-view {
 				display: flex;
 				justify-content: center;
 				align-items: center;
-        background: #76C458;
+				background: #76c458;
 				border-radius: 30rpx;
 			}
 		}
@@ -944,7 +1183,7 @@ picker-view {
 				border-radius: 32rpx;
 				height: 80rpx;
 				box-sizing: border-box;
-        border: 2px solid #76C458;
+				border: 2px solid #76c458;
 				padding-left: 44rpx;
 				padding-right: 42rpx;
 				display: flex;
@@ -952,7 +1191,7 @@ picker-view {
 				align-items: center;
 
 				.wrap1_2 {
-          color: #76C458;
+					color: #76c458;
 					font-size: 26rpx;
 				}
 
@@ -963,7 +1202,7 @@ picker-view {
 
 				&.disabled {
 					border: none;
-          background: #D8D8D8;
+					background: #d8d8d8;
 
 					.wrap1_1 {
 						color: #626262;
@@ -977,7 +1216,7 @@ picker-view {
 				}
 
 				&.active {
-          background: #76C458;
+					background: #76c458;
 
 					.wrap1_2 {
 						color: #fff;
@@ -1023,7 +1262,6 @@ picker-view {
 		padding-left: 30rpx;
 		padding-right: 30rpx;
 		& > .content7 {
-
 		}
 		& > .content3 {
 			display: flex;
@@ -1035,7 +1273,7 @@ picker-view {
 				margin-top: 30rpx;
 				width: 220rpx;
 				height: 84rpx;
-        background: #D8D8D8;
+				background: #d8d8d8;
 				display: flex;
 				flex-direction: column;
 				align-items: center;
@@ -1047,7 +1285,7 @@ picker-view {
 				}
 
 				.wrap4_2 {
-          color: #BE7E7E;
+					color: #be7e7e;
 					font-size: 16rpx;
 				}
 			}
@@ -1058,7 +1296,7 @@ picker-view {
 				margin-right: 16rpx;
 				font-size: 28rpx;
 				border-radius: 32rpx;
-        border: 2rpx solid #76C458;
+				border: 2rpx solid #76c458;
 				display: flex;
 				justify-content: center;
 				align-items: center;
@@ -1071,7 +1309,7 @@ picker-view {
 
 				&.active {
 					color: #fff;
-          background: #76C458;
+					background: #76c458;
 				}
 			}
 		}
@@ -1089,7 +1327,7 @@ picker-view {
 				display: flex;
 				justify-content: center;
 				align-items: center;
-        background: #76C458;
+				background: #76c458;
 				border-radius: 30rpx;
 			}
 		}
@@ -1099,15 +1337,15 @@ picker-view {
 			height: 66rpx;
 			display: flex;
 			align-items: center;
-      border-bottom: 1rpx solid #BABABA;
+			border-bottom: 1rpx solid #bababa;
-      border-top: 1rpx solid #BABABA;
+			border-top: 1rpx solid #bababa;
 
 			.wrap1 {
 				display: flex;
 				justify-content: center;
 				align-items: center;
 				flex-grow: 1;
-        color: #4E964D;
+				color: #4e964d;
 				font-size: 28rpx;
 			}
 
@@ -1116,7 +1354,7 @@ picker-view {
 				justify-content: center;
 				align-items: center;
 				flex-grow: 1;
-        color: #4E964D;
+				color: #4e964d;
 				font-size: 28rpx;
 			}
 
@@ -1125,7 +1363,7 @@ picker-view {
 				justify-content: center;
 				align-items: center;
 				flex-grow: 1;
-        color: #4E964D;
+				color: #4e964d;
 				font-size: 28rpx;
 			}
 		}
@@ -1191,7 +1429,7 @@ picker-view {
 				margin-top: 60rpx;
 
 				.wrap1 {
-          border: 1rpx dashed #DFE9F0;
+					border: 1rpx dashed #dfe9f0;
 					background-color: #fff;
 
 					.wrap1_1 {
@@ -1225,7 +1463,6 @@ picker-view {
 							width: 0;
 							height: 66rpx;
 							border-left: 0.5px solid #626262;
-
 						}
 
 						.wrap1_1_1 {
@@ -1243,13 +1480,13 @@ picker-view {
 				margin-top: 60rpx;
 
 				.prompt {
-          color: #4E964D;
+					color: #4e964d;
 					font-size: 16rpx;
 					margin-bottom: 4rpx;
 				}
 
 				.wrap1 {
-          border: 1rpx dashed #DFE9F0;
+					border: 1rpx dashed #dfe9f0;
 					background-color: #fff;
 
 					.wrap1_1 {
@@ -1273,7 +1510,6 @@ picker-view {
 							width: 0;
 							height: 66rpx;
 							border-left: 0.5px solid #626262;
-
 						}
 
 						.wrap1_1_1 {
@@ -1288,7 +1524,6 @@ picker-view {
 			}
 
 			& > .content2 {
-
 				display: flex;
 				justify-content: center;
 
@@ -1340,14 +1575,9 @@ picker-view {
 						height: 18rpx;
 						background-color: rgba(118, 196, 88, 1);
 					}
-
-
 				}
 			}
 		}
-
-
-
 	}
 }
 </style>

pages/home/index.vue

@@ -54,7 +54,6 @@ export default {
   },
   onShow() {
     this.getAddress();
-    this.pddIsPass();
   },
   components: {
     tabbar,
@@ -87,6 +86,7 @@ export default {
       console.log(res);
       if (res.status === 0) {
         this.addressList = res.data.data;
+        this.pddIsPass();
       } else {
         this.$common.msgToast(res.msg);
       }

pages/login/login.vue

@@ -1,14 +1,132 @@
 <template>
-  <view class="main">
+	<view class="bg">
-    <view class="ykfw" @click="goRouter">游客访问</view>
+		<!-- <image src="@/static/image/logo.png" mode="scaleToFill" class="logo" /> -->
-    <image src="@/static/image/logo.png" mode="scaleToFill" class="logo" />
-    <view class="btn">
-      <u-button v-if="isShow" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" color="transparent"
-        text="点击登录"></u-button>
-    </view>
 		<!-- <view class="btn">
       <u-button v-if="isLogoutShow" @click="login" color="transparent">点击登录</u-button>
     </view>-->
+		<u-navbar
+			title=" "
+			bgColor="transparent"
+			:leftIconSize="isShowCaptcha ? 20 : 0"
+			@leftClick="back"
+		>
+		</u-navbar>
+
+		<!-- <view class="back-wrapper">
+			<view class="back-inner">
+				<view class="back" v-if="isShowCaptcha" @tap="back">
+					<u-icon name="arrow-left" color="white" size="16"></u-icon>
+				</view>
+			</view>
+		</view> -->
+
+		<view class="main-wrapper">
+			<view class="main">
+				<view class="title-wrapper">
+					<view class="title">
+						<view class="title-01">登录</view>
+						<view class="title-02">品之鉴</view>
+					</view>
+					<view class="title-wrapper__desc"
+						>若为未注册账号则将自动转入品之鉴注册页</view
+					>
+				</view>
+
+				<transition-group name="fade">
+					<view class="phone-login-wrapper" v-show="!isShowCaptcha">
+						<view class="phone-wrapper">
+							<view class="name">手机号</view>
+							<u--input
+								placeholder="请输入手机号"
+								border="none"
+								:focus="true"
+								v-model="phone"
+								@change="handleChange"
+							></u--input>
+						</view>
+
+						<view class="agreement-wrapper">
+							<u-checkbox-group
+								v-model="checked"
+								iconPlacement="left"
+								placement="row"
+								inactiveColor="#76C458"
+								@change="handleChange"
+							>
+								<u-checkbox
+									name="yes"
+									shape="circle"
+									activeColor="#76C458"
+								></u-checkbox>
+								<view class="know">
+									已阅读并同意
+									<text @click="agreementHandle('service')"
+										>《软件许可及服务协议》</text
+									>
+									<text @click="agreementHandle('privacy')"
+										>&《隐私保护政策》</text
+									>
+								</view>
+							</u-checkbox-group>
+						</view>
+
+						<view
+							class="captcha-btn"
+							:style="{
+								background: disabled ? '#dadadc' : '#76c558'
+							}"
+							@tap="getCaptcha"
+							>获取验证码</view
+						>
+
+						<view class="btns-wrapper">
+							<view class="btns-wrapper__weixin">
+								<u-button
+									v-if="isShow"
+									open-type="getPhoneNumber"
+									@getphonenumber="getPhoneNumber"
+									color="transparent"
+									text="微信登录"
+								></u-button>
+							</view>
+
+							<view class="btns-wrapper__youke" @click="goRouter"
+								>游客访问</view
+							>
+						</view>
+					</view>
+					<view class="fill-captcha-wrapper" v-show="isShowCaptcha">
+						<view class="fill-captcha-wrapper__tip">
+							<view class="tip-01">已发送验证码至</view>
+							<view class="tip-02">{{ phone }}</view>
+						</view>
+
+						<view
+							class="form-view-class"
+							:class="captcha ? 'code_login_ipt' : ''"
+						>
+							<u-code-input
+								:maxlength="6"
+								:space="5"
+								:focus="true"
+								v-model="captcha"
+								@finish="handleFinish"
+							></u-code-input>
+						</view>
+
+						<view
+							class="resend-wrapper"
+							:style="{
+								color: timer === null ? '#76c558' : '#8d8d8d'
+							}"
+						>
+							<view @tap="resendCaptcha">重新发送</view>
+							<view v-if="timer !== null">({{ time }}s)</view>
+						</view>
+					</view>
+				</transition-group>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -16,64 +134,150 @@
 export default {
 	data() {
 		return {
-      code: "",
+			code: '',
-      openId: "",
+			openId: '',
-      isShow: false,
+			isShow: true,
-      isNew: false
+			isNew: false,
-    };
+			isShowCaptcha: false,
+			phone: '',
+			checked: [],
+			disabled: true,
+			captcha: '',
+			time: 60,
+			timer: null,
+			isPhoneLogin: false
+		}
 	},
 	methods: {
 		goRouter() {
 			uni.switchTab({
 				url: '/pages/home/index'
-      });
+			})
 		},
 		async getPhoneNumber(e) {
-      if (e.detail.errMsg == "getPhoneNumber:ok") {
+			if (e.detail.errMsg == 'getPhoneNumber:ok') {
 				// 用户允许或去手机号
-        let res = await this.$api.login.getTel({ code: e.detail.code });
+				let res = await this.$api.login.getTel({ code: e.detail.code })
 				if (res.status == 0) {
-          uni.setStorageSync("telNum", res.data.telNum);
+					uni.setStorageSync('token', res.data.token)
-          if (this.isNew) {
+					uni.setStorageSync('telNum', res.data.telNum)
+					this.isPhoneLogin = false
+					uni.setStorageSync('phoneLogin', this.isPhoneLogin)
+					if (res.data.isNew) {
 						uni.reLaunch({
-              url: "/pages/realName/realName"
+							url: '/pages/realName/realName'
-            });
+						})
 					} else {
 						uni.reLaunch({
-              url: "/pages/home/index"
+							url: '/pages/home/index'
-            });
+						})
 					}
 				} else {
-          this.$common.msgToast(res.msg);
+					this.$common.msgToast(res.msg)
 				}
 			} else {
-        this.$common.msgToast("请不要拒绝哟~重新点击登录");
+				this.$common.msgToast('请不要拒绝哟~重新点击登录')
 			}
 		},
 		//获取openId
 		async getOpenId() {
 			uni.login({
-        provider: "weixin",
+				provider: 'weixin',
-        success: async res => {
+				success: async (res) => {
-          console.log("res.code", res.code);
+					console.log('res.code', res.code)
-          this.code = res.code;
+					this.code = res.code
-          let res1 = await this.$api.login.login({ code: res.code });
+					let res1 = await this.$api.login.login({ code: res.code })
 					if (res1.status == 0) {
-            if (res1.data.accountInfo.isNew || !uni.getStorageSync("telNum")) {
+						if (
-              this.isShow = true;
+							res1.data.accountInfo.isNew ||
-              this.isNew = res1.data.accountInfo.isNew;
+							!uni.getStorageSync('telNum')
+						) {
+							this.isShow = true
+							// this.isNew = res1.data.accountInfo.isNew
 						} else {
 							uni.reLaunch({
-                url: "/pages/home/index"
+								url: '/pages/home/index'
-              });
+							})
 						}
-            uni.setStorageSync("token", res1.data.token);
+						uni.setStorageSync('token', res1.data.token)
 					} else {
-            this.$common.msgToast(res1.msg);
+						this.$common.msgToast(res1.msg)
 					}
 				}
-      });
+			})
 		},
+		handleChange() {
+			this.$nextTick(() => {
+				if (this.phone.length === 11 && this.checked.length > 0) {
+					this.disabled = false
+				} else {
+					this.disabled = true
+				}
+			})
+		},
+		agreementHandle(type) {
+			uni.navigateTo({
+				url: '/pages/realName/agreement?type=' + type
+			})
+		},
+		async getCaptcha() {
+			if (!this.disabled) {
+				const res = await this.$api.login.getTelCaptcha({
+					Telnum: this.phone
+				})
+				if (res.status === 0) {
+					this.$common.msgToast('验证码已发送')
+					this.isShowCaptcha = true
+					this.timer = setInterval(() => {
+						if (this.time > 0) this.time--
+						else {
+							clearInterval(this.timer)
+							this.time = 60
+							this.timer = null
+						}
+					}, 1000)
+				} else {
+					this.$common.msgToast('验证码发送失败，请稍后再试')
+				}
+			}
+		},
+		resendCaptcha() {
+			if (this.timer === null) {
+				this.getCaptcha()
+			}
+		},
+		async handleFinish(e) {
+			const res = await this.$api.login.checkTelCaptcha({
+				telnum: this.phone,
+				code: e
+			})
+			if (res.status === 0) {
+				this.$common.msgToast('请稍等')
+				uni.setStorageSync('token', res.data.token)
+				uni.setStorageSync('telNum', this.phone)
+				if (!res.data.isNew) {
+					uni.reLaunch({
+						url: `/pages/home/index`
+					})
+				} else {
+					this.isPhoneLogin = true
+					uni.setStorageSync('phoneLogin', this.isPhoneLogin)
+					uni.reLaunch({
+						url: `/pages/realName/realName`
+					})
+				}
+			} else {
+				this.$common.msgToast(res.msg)
+			}
+		},
+		back() {
+			this.isShowCaptcha = false
+			if (this.timer) {
+				clearInterval(this.timer)
+				this.time = 60
+				this.timer = null
+			}
+		}
 		// info判断用户是401就让他获取openId
 		// async info() {
 		//   const res = await this.$api.mine.info();
@@ -101,9 +305,9 @@ export default {
 		//   this.getOpenId();
 		// }
 		// this.info();
-    this.getOpenId();
+		// this.getOpenId()
+	}
 }
-};
 </script>
 
 <style lang="scss" scoped>
@@ -111,13 +315,17 @@ export default {
 	background: red;
 }
 
-.main {
+.bg {
-  background: url("https://cdns.fontree.cn/fonchain-main/prod/image/1381bd18-2f0c-49f1-84f6-d3eceb94f7a7/artwork/6ef00a09-f663-451d-ae0c-0d00cf4068c5.png");
+	background: url('https://e-cdn.fontree.cn/fonchain-main/prod/image/6248/avatar/8178c309-54da-4e45-89d1-25c3f0cc80e9.png');
+	background-repeat: no-repeat;
+	background-size: 100% 100%;
 	height: 100vh;
-  display: flex;
+	// display: flex;
-  align-items: center;
+	// justify-content: center;
-  flex-direction: column;
+	// align-items: center;
-  position: relative;
+	// flex-direction: column;
+	// position: relative;
+
 	.ykfw {
 		height: 50rpx;
 		position: absolute;
@@ -125,37 +333,226 @@ export default {
 		right: 40rpx;
 		color: #fff;
 	}
-  .logo {
+	// .logo {
-    margin-top: 250rpx;
+	// 	margin-top: 250rpx;
-    width: 398rpx;
+	// 	width: 398rpx;
-    height: 744rpx;
+	// 	height: 744rpx;
+	// }
+
+	/deep/ .u-navbar {
+	}
+
+	.back-wrapper {
+		width: 100%;
+		height: 200rpx;
+		box-sizing: border-box;
+		padding-top: 40rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		// background-color: red;
+
+		.back-inner {
+			width: 80vw;
+
+			.back {
+				width: 50rpx;
+				height: 50rpx;
+				border-radius: 50%;
+				background-color: #76c558;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
+	}
+
+	.main-wrapper {
+		// background-color: blue;
+		width: 100%;
+		height: calc(100vh - 300rpx);
+		display: flex;
+		justify-content: center;
+		// align-items: center;
+
+		.main {
+			width: 80vw;
+			height: 670rpx;
+
+			.title-wrapper {
+				margin-top: 400rpx;
+
+				.title {
+					font-size: 20px;
+					font-weight: bold;
+					display: flex;
+
+					.title-02 {
+						color: #76c558;
+					}
+				}
+
+				&__desc {
+					color: #8d8d8d;
+				}
+			}
+
+			.phone-login-wrapper {
+				margin-top: 100rpx;
+
+				.phone-wrapper {
+					box-sizing: border-box;
+					background: #ffffff;
+					border-radius: 20rpx;
+					width: 100%;
+					height: 92rpx;
+					display: flex;
+					align-items: center;
+					padding-left: 24rpx;
+
+					.name {
+						width: 120rpx;
+						height: 72rpx;
+						line-height: 72rpx;
+						border-right: 1rpx solid #d1d1d1;
+					}
+
+					/deep/ .u-input {
+						margin-left: 40rpx;
+					}
+				}
+
+				.agreement-wrapper {
+					font-size: 28rpx;
+					margin: 46rpx 0 10rpx 0;
+
+					.know {
+						margin-top: 20upx;
+						font-size: 28upx;
+						color: #8d8d8d;
+
+						text {
+							color: #76c458;
+						}
+					}
+				}
+
+				.captcha-btn {
+					width: 100%;
+					height: 92rpx;
+					box-sizing: border-box;
+					border-radius: 20rpx;
+					color: #fff;
+					background-color: #dadadc;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+				}
+
+				.btns-wrapper {
+					width: 100%;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					margin-top: 10rpx;
+
+					&__weixin {
+						/deep/ .u-button {
+							padding-left: 0 !important;
+							padding-right: 0 !important;
+							font-size: 30rpx !important;
+							color: #76c558 !important;
+						}
+					}
+
+					&__youke {
+						font-size: 30rpx;
+						color: #fff;
+					}
+				}
+			}
+
+			.fill-captcha-wrapper {
+				margin-top: 50rpx;
+
+				&__tip {
+					height: 40rpx;
+					display: flex;
+					margin-bottom: 10rpx;
+
+					.tip-01 {
+						color: #8d8d8d;
+					}
+
+					.tip-02 {
+						margin-left: 16rpx;
+					}
+				}
+
+				.form-view-class {
+					width: 100%;
+					box-sizing: border-box;
+					position: relative;
+
+					/deep/ .u-code-input {
+						display: flex;
+						justify-content: space-between;
+
+						.u-code-input__item {
+							width: calc(80vw / 7) !important;
+							height: 92rpx !important;
+							background-color: #ffffff !important;
+							border: none !important;
+							border-radius: 20rpx;
+
+							&:first-child {
+								// 隐藏第一个框的光标
+								.u-code-input__item__cursor {
+									width: 0px !important;
+								}
+							}
+						}
+
+						.u-code-input__input {
+							height: 92rpx !important;
+							width: 100%;
+							left: 20px;
+						}
+					}
+				}
+
+				.code_login_ipt {
+					//该类名作用为在验证码输入框有值时将验证码输入框的input挪出屏幕。
+					/deep/ .u-code-input__input {
+						height: 100% !important;
+						width: 0 !important;
+						left: -999rpx !important;
+					}
+				}
+
+				.resend-wrapper {
+					display: flex;
+					margin-top: 10rpx;
+				}
+			}
+
+			.fade-enter,
+			.fade-leave-to {
+				transform: translateX(100%);
+			}
+			.fade-enter-active,
+			.fade-leave-active {
+				transition: 0.5 linear;
+			}
+			.fade-enter-to,
+			.fade-leave {
+				transform: translateX(0);
+			}
+		}
 	}
 
 	uni-button:after {
 		border: 0px;
 	}
-
-  .btn {
-    background: transparent;
-    width: 200rpx;
-    position: fixed;
-    bottom: 15%;
-    color: #fff;
-    left: 50%;
-    transform: translateX(-50%);
-    font-size: 30rpx;
-    transition: all 1s;
-    animation: jump 1s ease-in-out infinite alternate;
-  }
-
-  @keyframes jump {
-    from {
-      bottom: 16%;
-    }
-
-    to {
-      bottom: 15%;
-    }
-  }
 }
 </style>

pages/mine/set-up.vue

@@ -32,7 +32,9 @@
 					:maxCount="1"
 					@afterRead="changeAvatar"
 				>
-          <view style="width: 348rpx; height: 56rpx; margin-top: 20rpx">
+					<view
+						style="width: 348rpx; height: 56rpx; margin-top: 20rpx"
+					>
 						<u-button
 							text="更换头像"
 							shape="circle"
@@ -55,10 +57,14 @@
 				</div>
 				<div class="wrap1_1">
 					<div class="wrap1_1_1">
-            {{ user.idType === "0" ? "身份证号" : "护照号" }}
+						{{ user.idType === '0' ? '身份证号' : '护照号' }}
 					</div>
 					<div class="wrap1_1_2">
-            {{ user.idType === "0" ? user.iDNum : user.passport.idNum }}
+						{{
+							user.idType === '0'
+								? user.iDNum
+								: user.passport.idNum
+						}}
 					</div>
 					<div class="wrap1_1_3">
 						<view></view>
@@ -76,92 +82,124 @@
 			<div class="wrap2"></div>
 		</div>
 		<div class="content4">
-      <div class="wrap1" @click="logout">注销账号</div>
+			<div class="wrap1" @click="signOff">注销账号</div>
 		</div>
+		<div class="content5">
+			<div class="wrap1" @click="logout">退出登录</div>
+		</div>
+		<u-modal
+			:show="showSignOff"
+			title="注销账号"
+			content="您确定要注销该账号吗？"
+			showCancelButton
+			:asyncClose="true"
+			@confirm="confirmSignOff"
+			@cancel="cancelSignOff"
+		></u-modal>
 	</div>
 </template>
 <script>
-import http from "@/http/api";
+import http from '@/http/api'
-import tabBarJs from "../../util/tabbar";
+import tabBarJs from '../../util/tabbar'
 export default {
-  name: "set-up",
+	name: 'set-up',
 	data() {
 		return {
 			user: {},
-    };
+			showSignOff: false
+		}
 	},
 	onLoad() {
-    this.info();
+		this.info()
 	},
 	methods: {
 		async info() {
-      const res = await this.$api.mine.info();
+			const res = await this.$api.mine.info()
 			if (res.status === 0) {
-        this.user = res.data.user;
+				this.user = res.data.user
 			} else {
-        this.$common.msgToast(res.msg);
+				this.$common.msgToast(res.msg)
 			}
 		},
 		changeAvatar(file) {
-      console.log(file);
+			console.log(file)
-      this.uploadFilePromise(file.file[0].url);
+			this.uploadFilePromise(file.file[0].url)
 		},
 		uploadFilePromise(url) {
 			return new Promise((resolve) => {
 				uni.uploadFile({
-          url: http.baseUrl + "/api/wxuser/uploadpic",
+					url: http.baseUrl + '/api/wxuser/uploadpic',
 					filePath: url,
-          name: "file",
+					name: 'file',
 					success: (res) => {
-            res.data = JSON.parse(res.data);
+						res.data = JSON.parse(res.data)
-            resolve(res.data.data.path);
+						resolve(res.data.data.path)
 						this.updateInfo({
-              avatar: res.data.data.path,
+							avatar: res.data.data.path
-            });
+						})
-          },
+					}
-        });
+				})
-      });
+			})
 		},
 		async updateInfo(data) {
-      let res = await this.$api.mine.update(data);
+			let res = await this.$api.mine.update(data)
 			if (res.status === 0) {
-        this.$common.msgToast("修改成功");
+				this.$common.msgToast('修改成功')
-        this.info();
+				this.info()
 			} else {
-        this.$common.msgToast(res.msg);
+				this.$common.msgToast(res.msg)
 			}
 		},
 		backDafult() {
 			this.updateInfo({
-        avatar:
+				avatar: 'https://cdns.fontree.cn/fonchain-main/prod/image/407e7c22-eb62-411e-957b-b6c296fde530/artwork/814ac246-e1eb-49fe-beee-dd53aaf5d309.png'
-          "https://cdns.fontree.cn/fonchain-main/prod/image/407e7c22-eb62-411e-957b-b6c296fde530/artwork/814ac246-e1eb-49fe-beee-dd53aaf5d309.png",
+			})
-      });
 		},
 
-    async logout() {
+		 signOff() {
-      let res = await this.$api.mine.logout();
+			this.showSignOff = true
+		},
+		async confirmSignOff() {
+			let res = await this.$api.mine.signOff()
 			if (res.status === 0) {
-        this.$common.msgToast("注销成功");
+				this.showSignOff = false
-        uni.clearStorageSync();
+				this.$common.msgToast('注销成功')
-        uni.setStorageSync("tabBar", tabBarJs);
+				uni.clearStorageSync()
+				uni.setStorageSync('tabBar', tabBarJs)
 				uni.navigateTo({
-          url: "/pages/login/login",
+					url: '/pages/login/login'
-        });
+				})
 			} else {
-        this.$common.msgToast(res.msg);
+				this.$common.msgToast(res.msg)
+			}
+		},
+		cancelSignOff() {
+			this.showSignOff = false
+		},
+		async logout() {
+			let res = await this.$api.mine.logout()
+			if (res.status === 0) {
+				this.$common.msgToast('退出成功')
+				uni.clearStorageSync()
+				uni.setStorageSync('tabBar', tabBarJs)
+				uni.navigateTo({
+					url: '/pages/login/login'
+				})
+			} else {
+				this.$common.msgToast(res.msg)
 			}
 		},
 		back() {
 			uni.navigateBack({
-        delta: 2,
+				delta: 2
-      });
+			})
-    },
+		}
-  },
+	}
-};
+}
 </script>
 <style scoped lang="scss">
 .set-up {
-  background-image: url("https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/4fdc9a0f-d72a-46b6-a04d-ed56d5465213.png");
+	background-image: url('https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/4fdc9a0f-d72a-46b6-a04d-ed56d5465213.png');
 	position: relative;
 	box-sizing: border-box;
 	overflow: hidden;
@@ -174,7 +212,7 @@ export default {
 	.content4 {
 		left: 50%;
 		transform: translateX(-50%);
-    bottom: 104rpx;
+		bottom: 200rpx;
 		position: absolute;
 		display: flex;
 
@@ -191,6 +229,26 @@ export default {
 			background: #3e3e3e;
 		}
 
+		.wrap1 {
+			color: #fff;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			font-size: 32rpx;
+			border-radius: 40rpx;
+			width: 292rpx;
+			height: 56rpx;
+			background: #a8a8a8;
+		}
+	}
+
+	.content5 {
+		left: 50%;
+		transform: translateX(-50%);
+		bottom: 100rpx;
+		position: absolute;
+		display: flex;
+
 		.wrap1 {
 			color: #fff;
 			display: flex;

pages/order-goods/index.vue

@@ -4,7 +4,12 @@
 			<template #left>
 				<u-action-sheet
 					:show="show"
-            :actions="statusValue.map(x=>({name:x.label,value:x.value}))"
+					:actions="
+						statusValue.map((x) => ({
+							name: x.label,
+							value: x.value
+						}))
+					"
 					title="请选择状态"
 					@close="show = false"
 					@select="statusSelect"
@@ -12,8 +17,17 @@
 				</u-action-sheet>
 				<div @click="openStatus" class="wrap1">
 					<div class="wrap1_1">
-            <div class="wrap1_1_1">{{ statusValue.find(x => x.value === artworkStatus).label }}</div>
+						<div class="wrap1_1_1">
-            <image style="width: 12rpx;height: 8rpx" src="../../static/dbx2@3x.png"></image>
+							{{
+								statusValue.find(
+									(x) => x.value === artworkStatus
+								).label
+							}}
+						</div>
+						<image
+							style="width: 12rpx; height: 8rpx"
+							src="../../static/dbx2@3x.png"
+						></image>
 					</div>
 				</div>
 			</template>
@@ -24,66 +38,131 @@
 					<image src="../../static/zu1@3x.png"></image>
 				</div>
 				<div class="wrap1_2"></div>
-        <input v-model="mobileKey" placeholder-style="color: #C7C7C7;font-size: 20rpx;"
+				<input
-               placeholder="在此处搜索您的订单"/>
+					v-model="mobileKey"
+					placeholder-style="color: #C7C7C7;font-size: 20rpx;"
+					placeholder="在此处搜索您的订单"
+				/>
 			</div>
-      <div class="wrap2" @click="search">
+			<div class="wrap2" @click="search">搜索</div>
-        搜索
-      </div>
-
 		</div>
 
 		<div class="content3">
-      <scroll-view :style="{height:`${elementBottom}rpx`}" class="scrollbox" :scroll-y="true" @scrolltolower="loadMore">
+			<scroll-view
+				:style="{ height: `${elementBottom}rpx` }"
+				class="scrollbox"
+				:scroll-y="true"
+				@scrolltolower="loadMore"
+			>
 				<div
-            v-for="(item,index) in mainList" :key="index"
+					v-for="(item, index) in mainList"
-            @touchstart="(e)=>{touchStart(e,index)}"
+					:key="index"
-            @touchmove="(e)=>{touchMove(e,index)}"
+					@touchstart="
-            @touchend="()=>{touchEnd(index)}"
+						(e) => {
+							touchStart(e, index)
+						}
+					"
+					@touchmove="
+						(e) => {
+							touchMove(e, index)
+						}
+					"
+					@touchend="
+						() => {
+							touchEnd(index)
+						}
+					"
 					@click="goRouter(item)"
-            :style="{transform: `translateX(${item.distanceX}px)`}" class="wrap1">
+					:style="{ transform: `translateX(${item.distanceX}px)` }"
+					class="wrap1"
+				>
 					<div class="wrap1_1">
-            <image :src="item.artworkImg?item.artworkImg:'../../static/jx632@3x.png'"></image>
+						<image
+							:src="
+								item.artworkImg
+									? item.artworkImg
+									: '../../static/jx632@3x.png'
+							"
+						></image>
 					</div>
 					<div class="wrap1_2">
 						<div class="wrap1_2_1">{{ item.artworkName }}</div>
 						<!--            <div class="wrap1_2_2">订单号:{{ item.artworkName }}</div>-->
-            <div class="wrap1_2_3">{{ item.artworkSquareSize }}平尺</div>
+						<div class="wrap1_2_3">
+							{{ item.artworkSquareSize }}平尺
+						</div>
 						<div class="wrap1_2_4">
 							<div v-if="![1].includes(item.artworkStatus)">
-                {{ item.startAt.replaceAll('-','.') || '' }}-{{ item.endAt.replaceAll('-','.') || '' }}
+								{{ item.startAt.replaceAll('-', '.') || '' }}-{{
+									item.endAt.replaceAll('-', '.') || ''
+								}}
 							</div>
 							<div v-else>{{ item.cycleName }}</div>
 						</div>
 					</div>
-          <div class="wrap1_3" :class="[`status${item.artworkStatus}`]">
+					<div
+						class="wrap1_3"
+						:class="[`status${item.artworkStatus}`]"
+					>
 						<div class="wrap1_3_1" v-if="item.artworkStatus === 4">
 							<div class="wrap1_3_1_1">{{ item.endAt }}</div>
 							<div class="wrap1_3_1_2">已延期</div>
-              <div class="wrap1_3_1_3" v-if="item.isSupplementary" @click.stop="openShow2(item)">点击补款</div>
+							<div
+								class="wrap1_3_1_3"
+								v-if="item.isSupplementary"
+								@click.stop="openShow2(item)"
+							>
+								点击补款
+							</div>
 						</div>
 						<div class="wrap1_3_3" v-if="item.artworkStatus !== 4">
-              <div class="wrap1_3_3_1">{{ statusValue.find(x => x.value === item.artworkStatus).label }}</div>
+							<div class="wrap1_3_3_1">
+								{{
+									statusValue.find(
+										(x) => x.value === item.artworkStatus
+									).label
+								}}
+							</div>
 						</div>
 						<div v-if="item.shelvesNum" class="wrap1_3_2">
 							<div class="wrap1_3_2_1">货架号:</div>
 							<div class="wrap1_3_2_2">{{ item.shelvesNum }}</div>
 						</div>
 						<div v-if="!item.shelvesNum" class="wrap1_3_2">
-              <div class="wrap1_3_2_2">{{item.warehouseName}}</div>
+							<div class="wrap1_3_2_2">
-            </div>
+								{{ item.warehouseName }}
-            <div class="wrap1_3_4" v-if="![1,5].includes(item.artworkStatus)" @click.stop="pickUp(item)">
-              {{item.isUserApplyPickUp?'取消申请':'申请取货'}}
 							</div>
 						</div>
-          <div class="wrap1_4" v-if="item.isRight&&item.artworkStatus===5" @click.stop="openDelete(item)">
+						<div
-            <image style="width: 80rpx;height: 80rpx" src="../../static/zu154@3x.png"></image>
+							class="wrap1_3_4"
+							v-if="![1, 5].includes(item.artworkStatus)"
+							@click.stop="pickUp(item)"
+						>
+							{{
+								item.isUserApplyPickUp ? '取消申请' : '申请取货'
+							}}
+						</div>
+					</div>
+					<div
+						class="wrap1_4"
+						v-if="item.isRight && item.artworkStatus === 5"
+						@click.stop="openDelete(item)"
+					>
+						<image
+							style="width: 80rpx; height: 80rpx"
+							src="../../static/zu154@3x.png"
+						></image>
 					</div>
 				</div>
 			</scroll-view>
 		</div>
 		<uni-popup ref="alertDialog" type="dialog">
-      <uni-popup-dialog :type="'info'" cancelText="关闭" confirmText="确认" title="提示" :content="messageText"
+			<uni-popup-dialog
+				:type="'info'"
+				cancelText="关闭"
+				confirmText="确认"
+				title="提示"
+				:content="messageText"
 				@confirm="popForward"
 			></uni-popup-dialog>
 		</uni-popup>
@@ -91,12 +170,12 @@
 	</div>
 </template>
 <script>
-import tabbar from "../../components/uiq-tabbar/uiq-tabbar.vue";
+import tabbar from '../../components/uiq-tabbar/uiq-tabbar.vue'
-import UImage from "../../uview-ui/components/u--image/u--image.vue";
+import UImage from '../../uview-ui/components/u--image/u--image.vue'
-import {postDataByParams} from "../../http/service";
+import { postDataByParams } from '../../http/service'
 
 export default {
-  name: "index",
+	name: 'index',
 	data() {
 		return {
 			messageText: '',
@@ -111,15 +190,23 @@ export default {
 			artworkStatus: 0,
 			pageSize: 999,
 			mainList: [],
-      statusValue: [{label: '全部状态', value: 0}, {label: '待入库', value: 1}, {
+			statusValue: [
+				{ label: '全部状态', value: 0 },
+				{ label: '待入库', value: 1 },
+				{
 					label: '已入库',
 					value: 2
-      }, {label: '即将到期', value: 3}, {label: '延期未补款', value: 4}, {label: '延期已补款', value: 7}, {label: '已取出', value: 5}]
+				},
+				{ label: '即将到期', value: 3 },
+				{ label: '延期未补款', value: 4 },
+				{ label: '延期已补款', value: 7 },
+				{ label: '已取出', value: 5 }
+			],
+			status: 0
 		}
 	},
 	components: { UImage, tabbar },
 	mounted() {
-
 		uni.getSystemInfo({
 			success: (res) => {
 				this.windowWidth = res.windowWidth
@@ -157,7 +244,6 @@ export default {
 			this.getData()
 		},
 		popForward() {
-
 			if (this.messageText === '确认补款吗') {
 				this.supplementaryPayment()
 			} else if (this.messageText === '确认删除吗') {
@@ -173,27 +259,50 @@ export default {
 			const data = {
 				ID: this.item.ID
 			}
-      const res = await postDataByParams('/api/warehouse/supply/paid', data)
+			uni.login({
+				provider: 'weixin',
+				success: async ({ code }) => {
+					const res3 = await this.$api.login.getOpenId({ code })
+					if (res3.code === 200) {
+						const res = await postDataByParams(
+							'/api/warehouse/supply/paid',
+							data
+						)
 						if (res.code === 200) {
-        uni.requestPayment({...res.data,fail:(res)=>{
+							uni.requestPayment({
-          },success:()=>{
+								...res.data,
+								fail: (res) => {},
+								success: () => {
 									this.getData()
 									uni.showToast({
 										title: '补款成功',
 										icon: 'none'
 									})
-          }})
+								}
+							})
 						} else {
 							uni.showToast({
 								title: res.msg,
 								icon: 'none'
 							})
 						}
+					} else {
+						this.$common.msgToast(res3.msg)
+					}
+				}
+			})
 		},
 		async getDistanceFromTopToPageBottom(classValue) {
-      const {windowHeight, windowWidth} = await uni.getSystemInfo();
+			const { windowHeight, windowWidth } = await uni.getSystemInfo()
-      const [{top}] = await new Promise(resolve => uni.createSelectorQuery().select(classValue).boundingClientRect().exec(resolve));
+			const [{ top }] = await new Promise((resolve) =>
-      this.elementBottom = ((windowHeight - top) / windowWidth) * 750 - 175;
+				uni
+					.createSelectorQuery()
+					.select(classValue)
+					.boundingClientRect()
+					.exec(resolve)
+			)
+			this.elementBottom =
+				((windowHeight - top) / windowWidth) * 750 - 175
 			/*    if(uni.getSystemInfoSync().platform === 'ios'){
         this.elementBottom = ((windowHeight - top) / windowWidth) * 750 - 175;
       }else {
@@ -267,35 +376,40 @@ export default {
 			if (this.mainList[index].artworkStatus !== 5) {
 				return
 			}
-      this.mainList[index].distanceX = e.touches[0].clientX - this.startX;
+			this.mainList[index].distanceX = e.touches[0].clientX - this.startX
 		},
 		touchStart(e, index) {
 			if (this.mainList[index].artworkStatus !== 5) {
 				return
 			}
 			this.mainList[index].isRight = true
-      this.startX = e.touches[0].clientX;
+			this.startX = e.touches[0].clientX
 		},
 		touchEnd(index) {
 			if (this.mainList[index].artworkStatus !== 5) {
 				return
 			}
-      if (this.mainList[index].distanceX < -((144 / 750) * this.windowWidth)) {
+			if (
-        this.mainList[index].distanceX = -((144 / 750) * this.windowWidth);
+				this.mainList[index].distanceX <
+				-((144 / 750) * this.windowWidth)
+			) {
+				this.mainList[index].distanceX = -(
+					(144 / 750) *
+					this.windowWidth
+				)
 			} else {
 				this.mainList[index].isRight = false
-        this.mainList[index].distanceX = 0;
+				this.mainList[index].distanceX = 0
 			}
 		}
 	}
 }
 </script>
 <style scoped lang="scss">
-
 .order-goods {
 	overflow: hidden;
 	box-sizing: border-box;
-  background-image: url("https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/4fdc9a0f-d72a-46b6-a04d-ed56d5465213.png");
+	background-image: url('https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/4fdc9a0f-d72a-46b6-a04d-ed56d5465213.png');
 	padding-left: 30rpx;
 	padding-right: 30rpx;
 	background-size: cover;
@@ -323,7 +437,7 @@ export default {
 				align-items: center;
 				height: 228rpx;
 				width: 154rpx;
-        background-color: #B7C0C8;
+				background-color: #b7c0c8;
 				right: -144rpx;
 				position: absolute;
 				z-index: -1;
@@ -347,40 +461,40 @@ export default {
 				}
 
 				&.status1 {
-          background: #FFBA00;
+					background: #ffba00;
 
 					.wrap1_3_3_1 {
-            color: #FFBA00;
+						color: #ffba00;
 					}
 				}
 
 				&.status2 {
-          background: #76C458;
+					background: #76c458;
 
 					.wrap1_3_3_1 {
-            color: #76C458;
+						color: #76c458;
 					}
 				}
 				&.status7 {
-          background: #76C458;
+					background: #76c458;
 
 					.wrap1_3_3_1 {
 						font-size: 23rpx !important;
 					}
 				}
 				&.status3 {
-          background: #76C458;
+					background: #76c458;
 
 					.wrap1_3_3_1 {
-            color: #FF4848;
+						color: #ff4848;
 					}
 				}
 
 				&.status4 {
-          background: #FF4848;
+					background: #ff4848;
 
 					.wrap1_3_3_1 {
-            color: #FF4848;
+						color: #ff4848;
 					}
 				}
 				.wrap1_3_4 {
@@ -414,7 +528,6 @@ export default {
 					.wrap1_3_2_2 {
 						color: #fff;
 						font-size: 24rpx;
-
 					}
 				}
 
@@ -439,7 +552,6 @@ export default {
 				}
 
 				.wrap1_3_1 {
-
 					padding-bottom: 6rpx;
 					display: flex;
 					flex-direction: column;
@@ -453,12 +565,12 @@ export default {
 
 					.wrap1_3_1_1 {
 						font-size: 16rpx;
-            color: #FF4848;
+						color: #ff4848;
 					}
 
 					.wrap1_3_1_2 {
 						font-size: 24rpx;
-            color: #FF4848;
+						color: #ff4848;
 					}
 
 					.wrap1_3_1_3 {
@@ -491,7 +603,6 @@ export default {
 					margin-bottom: 12rpx;
 					color: #808080;
 					font-size: 24rpx;
-
 				}
 
 				.wrap1_2_3 {
@@ -501,8 +612,7 @@ export default {
 				}
 
 				.wrap1_2_4 {
-
+					color: #ff4848;
-          color: #FF4848;
 					font-size: 24rpx;
 				}
 			}
@@ -530,7 +640,7 @@ export default {
 			font-size: 20rpx;
 			width: 94rpx;
 			height: 52rpx;
-      background-color: #4E964D;
+			background-color: #4e964d;
 		}
 
 		.wrap1 {
@@ -550,7 +660,6 @@ export default {
 			}
 
 			input {
-
 			}
 
 			.wrap1_1 {
@@ -573,7 +682,7 @@ export default {
 			color: #fff;
 			width: 132rpx;
 			height: 52rpx;
-      background-color: #76C458;
+			background-color: #76c458;
 			display: flex;
 			justify-content: center;
 			align-items: center;
@@ -586,13 +695,12 @@ export default {
 			align-items: center;
 
 			.wrap2_1 {
-        color: #4E964D;
+				color: #4e964d;
 				font-size: 32rpx;
-
 			}
 
 			.wrap2_2 {
-        color: #7C9F6F;
+				color: #7c9f6f;
 				font-size: 16rpx;
 			}
 		}
@@ -603,7 +711,7 @@ export default {
 				border-radius: 20rpx;
 				width: 156rpx;
 				height: 52rpx;
-        background-color: #4E964D;
+				background-color: #4e964d;
 				color: #fff;
 				font-size: 24rpx;
 				display: flex;

pages/realName/realName.vue

@@ -1,7 +1,11 @@
 <template>
 	<view class="main">
 		<view class="logo">
-      <image src="@/static/image/logo2.png" mode="scaleToFill" class="img" />
+			<image
+				src="@/static/image/logo2.png"
+				mode="scaleToFill"
+				class="img"
+			/>
 		</view>
 		<view class="container">
 			<view class="head">
@@ -10,7 +14,8 @@
 					<!-- <view :style="{ fontSize: '18rpx' }">*实名认证失败</view> -->
 					<!-- <view>*实名认证成功</view> -->
 				</view>
-        <view style="color: #7fa770; font-size: 24rpx; margin-left: 36rpx"
+				<view
+					style="color: #7fa770; font-size: 24rpx; margin-left: 36rpx"
 					>此实名仅用于注册该小程序</view
 				>
 			</view>
@@ -38,7 +43,7 @@
 				</view>
 				<view class="item">
 					<view class="name">{{
-            radiovalue === "0" ? "身份证号" : "护照号"
+						radiovalue === '0' ? '身份证号' : '护照号'
 					}}</view>
 					<u--input
 						placeholder="请输入身份证号"
@@ -88,7 +93,12 @@
 								></image>
 							</u-upload>
 						</view>
-            <view style="color: #4e964d; font-size: 20rpx; margin-top: 20rpx"
+						<view
+							style="
+								color: #4e964d;
+								font-size: 20rpx;
+								margin-top: 20rpx;
+							"
 							>上传身份证人像面</view
 						>
 					</view>
@@ -111,7 +121,12 @@
 								></image>
 							</u-upload>
 						</view>
-            <view style="color: #4e964d; font-size: 20rpx; margin-top: 20rpx"
+						<view
+							style="
+								color: #4e964d;
+								font-size: 20rpx;
+								margin-top: 20rpx;
+							"
 							>上传身份证国徽面</view
 						>
 					</view>
@@ -146,7 +161,12 @@
 								></image>
 							</u-upload>
 						</view>
-            <view style="color: #4e964d; font-size: 20rpx; margin-top: 20rpx"
+						<view
+							style="
+								color: #4e964d;
+								font-size: 20rpx;
+								margin-top: 20rpx;
+							"
 							>上传护照资料页</view
 						>
 					</view>
@@ -169,7 +189,12 @@
 								></image>
 							</u-upload>
 						</view>
-            <view style="color: #4e964d; font-size: 20rpx; margin-top: 20rpx"
+						<view
+							style="
+								color: #4e964d;
+								font-size: 20rpx;
+								margin-top: 20rpx;
+							"
 							>上传护照封面</view
 						>
 					</view>
@@ -178,22 +203,34 @@
 			<view v-if="needPersonSecret" class="face">
 				<view class="faceTitle">人脸识别</view>
 				<view class="recognition" @click="camera" v-if="!video">
-          <view style="color: #fff; margin-right: 10rpx">前往认证</view>
+					<view style="color: #fff; margin-right: 10rpx"
+						>前往认证</view
+					>
 					<u-icon name="arrow-right-double" color="#fff"></u-icon>
 				</view>
 				<view class="recognition" @click="camera" v-else>
-          <view style="color: #fff; margin-right: 10rpx">认证成功</view>
+					<view style="color: #fff; margin-right: 10rpx"
+						>认证成功</view
+					>
 					<u-icon name="checkmark-circle" color="#fff"></u-icon>
 				</view>
 			</view>
 			<view class="face">
 				<view class="faceTitle">法大大认证</view>
-        <view class="recognition" @click="fddRealName" v-if="!isFddSuccess">
+				<view
-          <view style="color: #fff; margin-right: 10rpx">前往认证</view>
+					class="recognition"
+					@click="fddRealName"
+					v-if="!isFddSuccess"
+				>
+					<view style="color: #fff; margin-right: 10rpx"
+						>前往认证</view
+					>
 					<u-icon name="arrow-right-double" color="#fff"></u-icon>
 				</view>
 				<view class="recognition" @click="fddRealName" v-else>
-          <view style="color: #fff; margin-right: 10rpx">认证成功</view>
+					<view style="color: #fff; margin-right: 10rpx"
+						>认证成功</view
+					>
 					<u-icon name="checkmark-circle" color="#fff"></u-icon>
 				</view>
 			</view>
@@ -214,7 +251,9 @@
 						<text @click="agreementHandle('service')"
 							>《软件许可及服务协议》</text
 						>
-            <text @click="agreementHandle('privacy')">&《隐私保护政策》</text>
+						<text @click="agreementHandle('privacy')"
+							>&《隐私保护政策》</text
+						>
 					</view>
 				</u-checkbox-group>
 			</view>
@@ -232,49 +271,51 @@
 </template>
 
 <script>
-import http from "@/http/api";
+import http from '@/http/api'
-import { configFun } from "../../http/login";
+import { configFun } from '../../http/login'
 export default {
 	data() {
 		return {
 			needPersonSecret: false,
-      name: "",
+			name: '',
-      num: "",
+			num: '',
-      passportId: "",
+			passportId: '',
 			checked: [],
 			fileList: [],
 			fileList2: [],
 			passport: [],
 			passport2: [],
-      video: "",
+			video: '',
 			isChecked: false,
 			isFddSuccess: false,
-      radiovalue: "0",
+			radiovalue: '0',
-      typeId: "",
+			typeId: '',
-    };
+			isPhoneLogin: false
+		}
 	},
 	async onLoad(options) {
-    const res = await configFun();
+		this.isPhoneLogin = uni.getStorageSync('phoneLogin') || false
+		const res = await configFun()
 		if (res.code === 200) {
-      this.needPersonSecret = res.data.needPersonSecret;
+			this.needPersonSecret = res.data.needPersonSecret
 		}
-    const data = JSON.parse(decodeURIComponent(options.data));
+		const data = JSON.parse(decodeURIComponent(options.data))
-    this.name = data.name || "";
+		this.name = data.name || ''
-    this.num = data.num || "";
+		this.num = data.num || ''
-    this.fileList = data.fileList || [];
+		this.fileList = data.fileList || []
-    this.fileList2 = data.fileList2 || [];
+		this.fileList2 = data.fileList2 || []
-    this.radiovalue = data.radiovalue;
+		this.radiovalue = data.radiovalue
-    this.passport = data.passport || [];
+		this.passport = data.passport || []
-    this.passport2 = data.passport2 || [];
+		this.passport2 = data.passport2 || []
-    this.passportId = data.passportId || "";
+		this.passportId = data.passportId || ''
 	},
 	async onShow() {
-    if (!uni.getStorageSync("telNum")) {
+		if (!uni.getStorageSync('telNum')) {
 			uni.navigateTo({
-        url: "/pages/login/login",
+				url: '/pages/login/login'
-      });
+			})
 		}
-    this.checkFdd();
+		this.checkFdd()
 		// if (uni.getStorageSync("tempVideoPath")) {
 		//   const tempVideoPath = uni.getStorageSync("tempVideoPath");
 		//   this.video = await this.uploadFilePromise(tempVideoPath);
@@ -297,234 +338,239 @@ export default {
 	watch: {
 		isFddSuccess(newValue) {
 			if (newValue) {
-        console.log(newValue);
+				console.log(newValue)
-        this.name = uni.getStorageSync("info").name || "";
+				this.name = uni.getStorageSync('info').name || ''
-        this.num = uni.getStorageSync("info").num || "";
+				this.num = uni.getStorageSync('info').num || ''
-        this.fileList = uni.getStorageSync("info").fileList || [];
+				this.fileList = uni.getStorageSync('info').fileList || []
-        this.fileList2 = uni.getStorageSync("info").fileList2 || [];
+				this.fileList2 = uni.getStorageSync('info').fileList2 || []
-        this.video = uni.getStorageSync("info").video || "";
+				this.video = uni.getStorageSync('info').video || ''
-        this.radiovalue = uni.getStorageSync("info").radiovalue ?? "0";
+				this.radiovalue = uni.getStorageSync('info').radiovalue ?? '0'
-        this.passport = uni.getStorageSync("info").passport || [];
+				this.passport = uni.getStorageSync('info').passport || []
-        this.passport2 = uni.getStorageSync("info").passport2 || [];
+				this.passport2 = uni.getStorageSync('info').passport2 || []
-        this.passportId = uni.getStorageSync("info").passportId || "";
+				this.passportId = uni.getStorageSync('info').passportId || ''
-        uni.removeStorageSync("info");
+				uni.removeStorageSync('info')
+			}
 		}
-    },
 	},
 	methods: {
 		changeName(value) {
-      this.name = value;
+			this.name = value
 		},
 		changeNum(value) {
-      this.num = value;
+			this.num = value
 		},
 		changePassport(value) {
-      this.passportId = value;
+			this.passportId = value
 		},
 		camera() {
 			uni.navigateTo({
-        url: "/pages/cameraContext/cameraContext",
+				url: '/pages/cameraContext/cameraContext'
-      });
+			})
 		},
 		async completeRegistration() {
-      const res1 = await this.checkFdd();
+			const res1 = await this.checkFdd()
-      if (!res1) return this.$common.msgToast("法大大验证未通过");
+			if (!res1) return this.$common.msgToast('法大大验证未通过')
 			if (res1 && this.typeId !== this.radiovalue)
-        return this.$common.msgToast("法大大验证失效请重新认证");
+				return this.$common.msgToast('法大大验证失效请重新认证')
 			if (!this.checked.length)
-        return this.$common.msgToast("请阅读并勾选协议");
+				return this.$common.msgToast('请阅读并勾选协议')
-      if (!this.name) return this.$common.msgToast("请输入姓名");
+			if (!this.name) return this.$common.msgToast('请输入姓名')
-      if (this.radiovalue === "0") {
+			if (this.radiovalue === '0') {
 				if (!this.fileList.length)
-          return this.$common.msgToast("请上传身份证人面像");
+					return this.$common.msgToast('请上传身份证人面像')
 				if (!this.fileList2.length)
-          return this.$common.msgToast("请上传身份国徽面");
+					return this.$common.msgToast('请上传身份国徽面')
-        if (!this.num) return this.$common.msgToast("请输入身份证号");
+				if (!this.num) return this.$common.msgToast('请输入身份证号')
 			} else {
 				if (!this.passport.length)
-          return this.$common.msgToast("请上传护照正面");
+					return this.$common.msgToast('请上传护照正面')
 				if (!this.passport2.length)
-          return this.$common.msgToast("请上传护照背面");
+					return this.$common.msgToast('请上传护照背面')
-        if (!this.passportId) return this.$common.msgToast("请输入护照号");
+				if (!this.passportId)
+					return this.$common.msgToast('请输入护照号')
 			}
 
 			//   if (this.needPersonSecret && !this.video)
 			//     return this.$common.msgToast("请上传人脸识别视频");
-      const res = await this.$api.login.register({
+			const res = await this.$api.login.phoneRegister({
-        user: {
+				telNum: uni.getStorageSync('telNum'),
-          telNum: uni.getStorageSync("telNum"),
 				realNameIDName: this.num,
 				realName: this.name,
-          realIDImgA: this.fileList[0]?.url || "",
+				realIDImgA: this.fileList[0]?.url || '',
-          realIDImgB: this.fileList2[0]?.url || "",
+				realIDImgB: this.fileList2[0]?.url || '',
 				idType: this.radiovalue,
 				passport: {
 					idNum: this.passportId,
 					name: this.name,
-            RealIDImgA: this.passport[0]?.url || "",
+					RealIDImgA: this.passport[0]?.url || '',
-            RealIDImgB: this.passport2[0]?.url || "",
+					RealIDImgB: this.passport2[0]?.url || ''
-          },
+				}
-        },
+			})
-      });
 			if (res.status === 0) {
 				uni.switchTab({
-          url: "/pages/home/index",
+					url: '/pages/home/index'
-        });
+				})
 			} else {
-        this.$common.msgToast(res.msg);
+				this.$common.msgToast(res.msg)
 			}
 		},
 		// 删除图片
 		deletePic(event) {
-      this[`fileList`].splice(event.index, 1);
+			this[`fileList`].splice(event.index, 1)
 		},
 		deletePassport(event) {
-      this[`passport`].splice(event.index, 1);
+			this[`passport`].splice(event.index, 1)
 		},
 		deletePassport2(event) {
-      this[`passport2`].splice(event.index, 1);
+			this[`passport2`].splice(event.index, 1)
 		},
 		// 删除图片
 		deletePic2(event) {
-      this[`fileList2`].splice(event.index, 1);
+			this[`fileList2`].splice(event.index, 1)
 		},
 		// 新增图片
 		async afterRead(event) {
 			// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
-      let lists = [].concat(event.file);
+			let lists = [].concat(event.file)
-      let fileListLen = this[`fileList`].length;
+			let fileListLen = this[`fileList`].length
 			lists.map((item) => {
 				this[`fileList`].push({
 					...item,
-          status: "uploading",
+					status: 'uploading',
-          message: "上传中",
+					message: '上传中'
-        });
+				})
-      });
+			})
 			for (let i = 0; i < lists.length; i++) {
-        const result = await this.uploadFilePromise(lists[i].url, "check");
+				const result = await this.uploadFilePromise(
-        let item = this[`fileList`][fileListLen];
+					lists[i].url,
+					'check'
+				)
+				let item = this[`fileList`][fileListLen]
 				this[`fileList`].splice(
 					fileListLen,
 					1,
 					Object.assign(item, {
-            status: "success",
+						status: 'success',
-            message: "",
+						message: '',
-            url: result,
+						url: result
 					})
-        );
+				)
-        fileListLen++;
+				fileListLen++
 			}
 		},
 		async afterReadPassport(event) {
-      let lists = [].concat(event.file);
+			let lists = [].concat(event.file)
-      let fileListLen = this[`passport`].length;
+			let fileListLen = this[`passport`].length
 			lists.map((item) => {
 				this[`passport`].push({
 					...item,
-          status: "uploading",
+					status: 'uploading',
-          message: "上传中",
+					message: '上传中'
-        });
+				})
-      });
+			})
 			for (let i = 0; i < lists.length; i++) {
-        const result = await this.uploadFilePromise(lists[i].url, "check");
+				const result = await this.uploadFilePromise(
-        let item = this[`passport`][fileListLen];
+					lists[i].url,
+					'check'
+				)
+				let item = this[`passport`][fileListLen]
 				this[`passport`].splice(
 					fileListLen,
 					1,
 					Object.assign(item, {
-            status: "success",
+						status: 'success',
-            message: "",
+						message: '',
-            url: result,
+						url: result
 					})
-        );
+				)
-        fileListLen++;
+				fileListLen++
 			}
 		},
 		async afterRead2(event) {
 			// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
-      let lists = [].concat(event.file);
+			let lists = [].concat(event.file)
-      let fileListLen = this[`fileList2`].length;
+			let fileListLen = this[`fileList2`].length
 			lists.map((item) => {
 				this[`fileList2`].push({
 					...item,
-          status: "uploading",
+					status: 'uploading',
-          message: "上传中",
+					message: '上传中'
-        });
+				})
-      });
+			})
 			for (let i = 0; i < lists.length; i++) {
-        const result = await this.uploadFilePromise(lists[i].url);
+				const result = await this.uploadFilePromise(lists[i].url)
-        let item = this[`fileList2`][fileListLen];
+				let item = this[`fileList2`][fileListLen]
 				this[`fileList2`].splice(
 					fileListLen,
 					1,
 					Object.assign(item, {
-            status: "success",
+						status: 'success',
-            message: "",
+						message: '',
-            url: result,
+						url: result
 					})
-        );
+				)
-        fileListLen++;
+				fileListLen++
 			}
 		},
 		async afterReadPassport2(event) {
 			// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
-      let lists = [].concat(event.file);
+			let lists = [].concat(event.file)
-      let fileListLen = this[`passport2`].length;
+			let fileListLen = this[`passport2`].length
 			lists.map((item) => {
 				this[`passport2`].push({
 					...item,
-          status: "uploading",
+					status: 'uploading',
-          message: "上传中",
+					message: '上传中'
-        });
+				})
-      });
+			})
 			for (let i = 0; i < lists.length; i++) {
-        const result = await this.uploadFilePromise(lists[i].url);
+				const result = await this.uploadFilePromise(lists[i].url)
-        let item = this[`passport2`][fileListLen];
+				let item = this[`passport2`][fileListLen]
 				this[`passport2`].splice(
 					fileListLen,
 					1,
 					Object.assign(item, {
-            status: "success",
+						status: 'success',
-            message: "",
+						message: '',
-            url: result,
+						url: result
 					})
-        );
+				)
-        fileListLen++;
+				fileListLen++
 			}
 		},
 		uploadFilePromise(url, type = null) {
 			return new Promise((resolve) => {
 				uni.uploadFile({
-          url: http.baseUrl + "/api/wxuser/uploadpic",
+					url: http.baseUrl + '/api/wxuser/uploadpic',
 					filePath: url,
-          name: "file",
+					name: 'file',
 					success: (res) => {
-            const { path } = JSON.parse(res.data).data;
+						const { path } = JSON.parse(res.data).data
-            resolve(path);
+						resolve(path)
-            if (type === "check" && this.radiovalue === "0") {
+						if (type === 'check' && this.radiovalue === '0') {
-              this.chenckId(path);
+							this.chenckId(path)
 						}
-          },
+					}
-        });
+				})
-      });
+			})
 		},
 		async chenckId(realIDImgA) {
-      const res = await this.$api.login.chenckId({ realIDImgA });
+			const res = await this.$api.login.chenckId({ realIDImgA })
 			if (res.status === 0) {
-        this.num = res.data.iDNum;
+				this.num = res.data.iDNum
-        this.name = res.data.realName;
+				this.name = res.data.realName
 			} else {
-        this.$common.msgToast("未识别身份信息");
+				this.$common.msgToast('未识别身份信息')
 			}
 		},
 		async fddRealName() {
-      console.log(this.radiovalue);
+			console.log(this.radiovalue)
-      if (this.radiovalue === "0") {
+			if (this.radiovalue === '0') {
 				if (!this.num || !this.name)
-          return this.$common.msgToast("姓名和身份证号不能为空");
+					return this.$common.msgToast('姓名和身份证号不能为空')
 			} else {
 				if (!this.passportId || !this.name)
-          return this.$common.msgToast("姓名和护照号不能为空");
+					return this.$common.msgToast('姓名和护照号不能为空')
 			}
 			const data = {
 				num: this.num,
@@ -534,36 +580,47 @@ export default {
 				passport: this.passport,
 				passport2: this.passport2,
 				passportId: this.passportId,
-        radiovalue: this.radiovalue,
+				radiovalue: this.radiovalue
-      };
+			}
-      console.log(data, "data");
+			console.log(data, 'data')
-      uni.setStorageSync("info", data);
+			uni.setStorageSync('info', data)
-      const mobile = uni.getStorageSync("telNum");
+			const mobile = uni.getStorageSync('telNum')
 			const res = await this.$api.login.fddRealName({
 				customerName: this.name,
 				customerIdentNo: this.num || this.passportId,
 				mobile,
-        idType: this.radiovalue,
+				idType: this.radiovalue
-      });
+			})
 			if (res.status === 0) {
-        uni.setStorageSync("fddUrl", res.data?.url);
+				uni.setStorageSync('fddUrl', res.data?.url)
 				uni.navigateTo({
-          url: "/pages/realName/FDDRegister",
+					url: '/pages/realName/FDDRegister'
-        });
+				})
 			} else {
-        this.$common.msgToast(res.msg);
+				this.$common.msgToast(res.msg)
 			}
 		},
 		checkFdd() {
+			if (this.isPhoneLogin) {
+				return this.$api.login.checkPhoneFdd().then((res) => {
+					if (res.status === 0) {
+						this.isFddSuccess = res.data.isVerify
+						this.typeId = res.data.idType
+						return res.data.isVerify
+					} else {
+						this.$common.msgToast(res.msg)
+					}
+				})
+			}
 			return this.$api.login.checkFdd().then((res) => {
 				if (res.status === 0) {
-          this.isFddSuccess = res.data.isVerify;
+					this.isFddSuccess = res.data.isVerify
-          this.typeId = res.data.idType;
+					this.typeId = res.data.idType
-          return res.data.isVerify;
+					return res.data.isVerify
 				} else {
-          this.$common.msgToast(res.msg);
+					this.$common.msgToast(res.msg)
 				}
-      });
+			})
 		},
 		agreementHandle(type) {
 			const data = {
@@ -574,32 +631,32 @@ export default {
 				radiovalue: this.radiovalue,
 				passport: this.passport,
 				passport2: this.passport2,
-        passportId: this.passportId,
+				passportId: this.passportId
-      };
+			}
-      uni.setStorageSync("info", data);
+			uni.setStorageSync('info', data)
 			uni.navigateTo({
 				url:
-          "/pages/realName/agreement?type=" +
+					'/pages/realName/agreement?type=' +
 					type +
-          "&data=" +
+					'&data=' +
-          encodeURIComponent(JSON.stringify(data)),
+					encodeURIComponent(JSON.stringify(data))
-      });
+			})
 		},
 		groupChange(value) {
-      console.log(value);
+			console.log(value)
-      if (value === "1") {
+			if (value === '1') {
-        this.fileList = [];
+				this.fileList = []
-        this.fileList2 = [];
+				this.fileList2 = []
-        this.name = "";
+				this.name = ''
-        this.num = "";
+				this.num = ''
 			} else {
-        this.passport = [];
+				this.passport = []
-        this.passport2 = [];
+				this.passport2 = []
-        this.passportId = "";
+				this.passportId = ''
+			}
+		}
+	}
 }
-    },
-  },
-};
 </script>
 
 <style lang="scss" scoped>
@@ -616,7 +673,7 @@ export default {
 }
 
 .main {
-  background: url("@/static/image/login-bg.png") no-repeat;
+	background: url('@/static/image/login-bg.png') no-repeat;
 	box-sizing: border-box;
 	display: flex;
 	flex-direction: column;

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

@@ -1,12 +1,12 @@
 {
   "pages": [
+    "pages/home/index",
     "pages/login/login",
     "pages/register/register",
     "pages/realName/realName",
     "pages/realName/FDDRegister",
     "pages/realName/agreement",
     "pages/cameraContext/cameraContext",
-    "pages/home/index",
     "pages/contract/index",
     "pages/order-goods/index",
     "pages/signwebview/index",
@@ -49,6 +49,15 @@
     }
   },
   "subpackages": [
+    {
+      "root": "pagesFace",
+      "name": "pagesFace",
+      "pages": [
+        "pages/index/index",
+        "pages/webview/webview",
+        "pages/middle/middle"
+      ]
+    }
   ],
   "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/components/title-block/title-block.js

@@ -1,10 +1,10 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/title-block/title-block"],{414:function(n,t,e){"use strict";e.r(t);var r=e(415),u=e(417);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);e(419);var i,o=e(33),a=Object(o["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"6a01af94",null,!1,r["components"],i);a.options.__file="components/title-block/title-block.vue",t["default"]=a.exports},415:function(n,t,e){"use strict";e.r(t);var r=e(416);e.d(t,"render",(function(){return r["render"]})),e.d(t,"staticRenderFns",(function(){return r["staticRenderFns"]})),e.d(t,"recyclableRender",(function(){return r["recyclableRender"]})),e.d(t,"components",(function(){return r["components"]}))},416:function(n,t,e){"use strict";var r;e.r(t),e.d(t,"render",(function(){return u})),e.d(t,"staticRenderFns",(function(){return i})),e.d(t,"recyclableRender",(function(){return c})),e.d(t,"components",(function(){return r}));var u=function(){var n=this,t=n.$createElement;n._self._c},c=!1,i=[];u._withStripped=!0},417:function(n,t,e){"use strict";e.r(t);var r=e(418),u=e.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(c);t["default"]=u.a},418:function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={name:"title-block",data:function(){return{statusBarHeight:n.getSystemInfoSync().statusBarHeight+5}},props:{title:String}};t.default=e}).call(this,e(2)["default"])},419:function(n,t,e){"use strict";e.r(t);var r=e(420),u=e.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(c);t["default"]=u.a},420:function(n,t,e){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/title-block/title-block"],{430:function(n,t,e){"use strict";e.r(t);var r=e(431),u=e(433);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);e(435);var i,o=e(33),a=Object(o["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"6a01af94",null,!1,r["components"],i);a.options.__file="components/title-block/title-block.vue",t["default"]=a.exports},431:function(n,t,e){"use strict";e.r(t);var r=e(432);e.d(t,"render",(function(){return r["render"]})),e.d(t,"staticRenderFns",(function(){return r["staticRenderFns"]})),e.d(t,"recyclableRender",(function(){return r["recyclableRender"]})),e.d(t,"components",(function(){return r["components"]}))},432:function(n,t,e){"use strict";var r;e.r(t),e.d(t,"render",(function(){return u})),e.d(t,"staticRenderFns",(function(){return i})),e.d(t,"recyclableRender",(function(){return c})),e.d(t,"components",(function(){return r}));var u=function(){var n=this,t=n.$createElement;n._self._c},c=!1,i=[];u._withStripped=!0},433:function(n,t,e){"use strict";e.r(t);var r=e(434),u=e.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(c);t["default"]=u.a},434:function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={name:"title-block",data:function(){return{statusBarHeight:n.getSystemInfoSync().statusBarHeight+5}},props:{title:String}};t.default=e}).call(this,e(2)["default"])},435:function(n,t,e){"use strict";e.r(t);var r=e(436),u=e.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(c);t["default"]=u.a},436:function(n,t,e){}}]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/components/title-block/title-block.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/title-block/title-block-create-component',
     {
         'components/title-block/title-block-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('2')['createComponent'](__webpack_require__(414))
+            __webpack_require__('2')['createComponent'](__webpack_require__(430))
         })
     },
     [['components/title-block/title-block-create-component']]

unpackage/dist/dev/mp-weixin/components/title-block/title-block.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
+  "usingComponents": {},
-  "usingComponents": {}
+  "component": true
 }

unpackage/dist/dev/mp-weixin/components/uiq-tabbar/uiq-tabbar.js

@@ -1,10 +1,10 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/uiq-tabbar/uiq-tabbar"],{447:function(n,e,t){"use strict";t.r(e);var r=t(448),o=t(450);for(var u in o)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(u);t(452);var a,c=t(33),i=Object(c["default"])(o["default"],r["render"],r["staticRenderFns"],!1,null,null,null,!1,r["components"],a);i.options.__file="components/uiq-tabbar/uiq-tabbar.vue",e["default"]=i.exports},448:function(n,e,t){"use strict";t.r(e);var r=t(449);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},449:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return o})),t.d(e,"staticRenderFns",(function(){return a})),t.d(e,"recyclableRender",(function(){return u})),t.d(e,"components",(function(){return r}));try{r={uTabbar:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-tabbar/u-tabbar")]).then(t.bind(null,550))},uTabbarItem:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-tabbar-item/u-tabbar-item")]).then(t.bind(null,558))}}}catch(c){if(-1===c.message.indexOf("Cannot find module")||-1===c.message.indexOf(".vue"))throw c;console.error(c.message),console.error("1. 排查组件名称拼写是否正确"),console.error("2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"),console.error("3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件")}var o=function(){var n=this,e=n.$createElement;n._self._c},u=!1,a=[];o._withStripped=!0},450:function(n,e,t){"use strict";t.r(e);var r=t(451),o=t.n(r);for(var u in r)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(u);e["default"]=o.a},451:function(n,e,t){"use strict";(function(n){var r=t(4);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;r(t(30));var o={props:{current:Number},data:function(){return{tabList:n.getStorageSync("tabBar")}},mounted:function(){},methods:{handleTabClick:function(e){n.switchTab({url:"/"+this.tabList[e].pagePath})}}};e.default=o}).call(this,t(2)["default"])},452:function(n,e,t){"use strict";t.r(e);var r=t(453),o=t.n(r);for(var u in r)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(u);e["default"]=o.a},453:function(n,e,t){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/uiq-tabbar/uiq-tabbar"],{463:function(n,e,t){"use strict";t.r(e);var r=t(464),o=t(466);for(var u in o)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(u);t(468);var a,c=t(33),i=Object(c["default"])(o["default"],r["render"],r["staticRenderFns"],!1,null,null,null,!1,r["components"],a);i.options.__file="components/uiq-tabbar/uiq-tabbar.vue",e["default"]=i.exports},464:function(n,e,t){"use strict";t.r(e);var r=t(465);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},465:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return o})),t.d(e,"staticRenderFns",(function(){return a})),t.d(e,"recyclableRender",(function(){return u})),t.d(e,"components",(function(){return r}));try{r={uTabbar:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-tabbar/u-tabbar")]).then(t.bind(null,582))},uTabbarItem:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-tabbar-item/u-tabbar-item")]).then(t.bind(null,590))}}}catch(c){if(-1===c.message.indexOf("Cannot find module")||-1===c.message.indexOf(".vue"))throw c;console.error(c.message),console.error("1. 排查组件名称拼写是否正确"),console.error("2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"),console.error("3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件")}var o=function(){var n=this,e=n.$createElement;n._self._c},u=!1,a=[];o._withStripped=!0},466:function(n,e,t){"use strict";t.r(e);var r=t(467),o=t.n(r);for(var u in r)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(u);e["default"]=o.a},467:function(n,e,t){"use strict";(function(n){var r=t(4);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;r(t(30));var o={props:{current:Number},data:function(){return{tabList:n.getStorageSync("tabBar")}},mounted:function(){},methods:{handleTabClick:function(e){n.switchTab({url:"/"+this.tabList[e].pagePath})}}};e.default=o}).call(this,t(2)["default"])},468:function(n,e,t){"use strict";t.r(e);var r=t(469),o=t.n(r);for(var u in r)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(u);e["default"]=o.a},469:function(n,e,t){}}]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/components/uiq-tabbar/uiq-tabbar.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/uiq-tabbar/uiq-tabbar-create-component',
     {
         'components/uiq-tabbar/uiq-tabbar-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('2')['createComponent'](__webpack_require__(447))
+            __webpack_require__('2')['createComponent'](__webpack_require__(463))
         })
     },
     [['components/uiq-tabbar/uiq-tabbar-create-component']]

unpackage/dist/dev/mp-weixin/pages/cameraContext/cameraContext.js

@@ -1,2 +1,2 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/cameraContext/cameraContext"],{240:function(e,n,t){"use strict";(function(e,n){var o=t(4);t(26);o(t(25));var r=o(t(241));e.__webpack_require_UNI_MP_PLUGIN__=t,n(r.default)}).call(this,t(1)["default"],t(2)["createPage"])},241:function(e,n,t){"use strict";t.r(n);var o=t(242),r=t(244);for(var c in r)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(c);t(246);var u,a=t(33),i=Object(a["default"])(r["default"],o["render"],o["staticRenderFns"],!1,null,"0c0dc048",null,!1,o["components"],u);i.options.__file="pages/cameraContext/cameraContext.vue",n["default"]=i.exports},242:function(e,n,t){"use strict";t.r(n);var o=t(243);t.d(n,"render",(function(){return o["render"]})),t.d(n,"staticRenderFns",(function(){return o["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return o["recyclableRender"]})),t.d(n,"components",(function(){return o["components"]}))},243:function(e,n,t){"use strict";var o;t.r(n),t.d(n,"render",(function(){return r})),t.d(n,"staticRenderFns",(function(){return u})),t.d(n,"recyclableRender",(function(){return c})),t.d(n,"components",(function(){return o}));try{o={uCountDown:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-count-down/u-count-down")]).then(t.bind(null,430))},uButton:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-button/u-button")]).then(t.bind(null,347))}}}catch(a){if(-1===a.message.indexOf("Cannot find module")||-1===a.message.indexOf(".vue"))throw a;console.error(a.message),console.error("1. 排查组件名称拼写是否正确"),console.error("2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"),console.error("3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件")}var r=function(){var e=this,n=e.$createElement;e._self._c},c=!1,u=[];r._withStripped=!0},244:function(e,n,t){"use strict";t.r(n);var o=t(245),r=t.n(o);for(var c in o)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(c);n["default"]=r.a},245:function(e,n,t){"use strict";(function(e){var o=t(4);Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r=o(t(63)),c=o(t(65)),u=t(35),a={data:function(){return{needPersonSecret:!1,isAnimate:!1,tempVideoPath:"",tips:"⚪录制",isEnd:!0}},onLoad:function(){var n=this;return(0,c.default)(r.default.mark((function t(){var o;return r.default.wrap((function(t){while(1)switch(t.prev=t.next){case 0:return t.next=2,(0,u.configFun)();case 2:o=t.sent,200===o.code&&(n.needPersonSecret=o.data.needPersonSecret),n.ctx=e.createCameraContext(),n.tips="⚪录制";case 6:case"end":return t.stop()}}),t)})))()},methods:{startRecord:function(){var n=this;this.ctx.startRecord({success:function(t){n.isAnimate=!0,n.tips="⚪录制中",setTimeout((function(){n.ctx.stopRecord({success:function(t){console.log("自动停止录像",t),n.isAnimate=!1,n.$common.msgToast("录制完成"),n.tempVideoPath=t.tempVideoPath,n.tips="⚪录制完成",n.isEnd=!1,e.setStorageSync("tempVideoPath",t.tempVideoPath)}})}),5e3)}})},back:function(){e.navigateBack({delta:2})}}};n.default=a}).call(this,t(2)["default"])},246:function(e,n,t){"use strict";t.r(n);var o=t(247),r=t.n(o);for(var c in o)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(c);n["default"]=r.a},247:function(e,n,t){}},[[240,"common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/cameraContext/cameraContext"],{240:function(e,n,t){"use strict";(function(e,n){var o=t(4);t(26);o(t(25));var r=o(t(241));e.__webpack_require_UNI_MP_PLUGIN__=t,n(r.default)}).call(this,t(1)["default"],t(2)["createPage"])},241:function(e,n,t){"use strict";t.r(n);var o=t(242),r=t(244);for(var c in r)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(c);t(246);var u,a=t(33),i=Object(a["default"])(r["default"],o["render"],o["staticRenderFns"],!1,null,"0c0dc048",null,!1,o["components"],u);i.options.__file="pages/cameraContext/cameraContext.vue",n["default"]=i.exports},242:function(e,n,t){"use strict";t.r(n);var o=t(243);t.d(n,"render",(function(){return o["render"]})),t.d(n,"staticRenderFns",(function(){return o["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return o["recyclableRender"]})),t.d(n,"components",(function(){return o["components"]}))},243:function(e,n,t){"use strict";var o;t.r(n),t.d(n,"render",(function(){return r})),t.d(n,"staticRenderFns",(function(){return u})),t.d(n,"recyclableRender",(function(){return c})),t.d(n,"components",(function(){return o}));try{o={uCountDown:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-count-down/u-count-down")]).then(t.bind(null,446))},uButton:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-button/u-button")]).then(t.bind(null,377))}}}catch(a){if(-1===a.message.indexOf("Cannot find module")||-1===a.message.indexOf(".vue"))throw a;console.error(a.message),console.error("1. 排查组件名称拼写是否正确"),console.error("2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"),console.error("3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件")}var r=function(){var e=this,n=e.$createElement;e._self._c},c=!1,u=[];r._withStripped=!0},244:function(e,n,t){"use strict";t.r(n);var o=t(245),r=t.n(o);for(var c in o)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(c);n["default"]=r.a},245:function(e,n,t){"use strict";(function(e){var o=t(4);Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r=o(t(63)),c=o(t(65)),u=t(35),a={data:function(){return{needPersonSecret:!1,isAnimate:!1,tempVideoPath:"",tips:"⚪录制",isEnd:!0}},onLoad:function(){var n=this;return(0,c.default)(r.default.mark((function t(){var o;return r.default.wrap((function(t){while(1)switch(t.prev=t.next){case 0:return t.next=2,(0,u.configFun)();case 2:o=t.sent,200===o.code&&(n.needPersonSecret=o.data.needPersonSecret),n.ctx=e.createCameraContext(),n.tips="⚪录制";case 6:case"end":return t.stop()}}),t)})))()},methods:{startRecord:function(){var n=this;this.ctx.startRecord({success:function(t){n.isAnimate=!0,n.tips="⚪录制中",setTimeout((function(){n.ctx.stopRecord({success:function(t){console.log("自动停止录像",t),n.isAnimate=!1,n.$common.msgToast("录制完成"),n.tempVideoPath=t.tempVideoPath,n.tips="⚪录制完成",n.isEnd=!1,e.setStorageSync("tempVideoPath",t.tempVideoPath)}})}),5e3)}})},back:function(){e.navigateBack({delta:2})}}};n.default=a}).call(this,t(2)["default"])},246:function(e,n,t){"use strict";t.r(n);var o=t(247),r=t.n(o);for(var c in o)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(c);n["default"]=r.a},247:function(e,n,t){}},[[240,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/cameraContext/cameraContext.js.map

unpackage/dist/dev/mp-weixin/pages/confirm-order/index.wxss

@@ -36,7 +36,7 @@
   justify-content: center;
   align-items: center;
   z-index: -1;
-  background: #A9D897;
+  background: #a9d897;
   color: #fff;
   height: 62rpx;
 }
@@ -251,7 +251,7 @@ picker-view.data-v-2b9e2b4a {
   height: 56rpx;
   color: #fff;
   font-size: 32rpx;
-  background: #76C458;
+  background: #76c458;
 }
 .order-details > .content5 .wrap1.data-v-2b9e2b4a {
   margin-left: 18rpx;
@@ -266,7 +266,7 @@ picker-view.data-v-2b9e2b4a {
 }
 .order-details > .content5 .wrap1 .wrap1_2.data-v-2b9e2b4a {
   font-size: 32rpx;
-  color: #76C458;
+  color: #76c458;
 }
 .order-details .poup1.data-v-2b9e2b4a {
   padding-top: 28rpx;
@@ -287,7 +287,7 @@ picker-view.data-v-2b9e2b4a {
   display: flex;
   justify-content: center;
   align-items: center;
-  background: #76C458;
+  background: #76c458;
   border-radius: 30rpx;
 }
 .order-details .poup1 > .content3.data-v-2b9e2b4a {
@@ -298,7 +298,7 @@ picker-view.data-v-2b9e2b4a {
   border-radius: 32rpx;
   height: 80rpx;
   box-sizing: border-box;
-  border: 2px solid #76C458;
+  border: 2px solid #76c458;
   padding-left: 44rpx;
   padding-right: 42rpx;
   display: flex;
@@ -306,7 +306,7 @@ picker-view.data-v-2b9e2b4a {
   align-items: center;
 }
 .order-details .poup1 > .content3 .wrap1 .wrap1_2.data-v-2b9e2b4a {
-  color: #76C458;
+  color: #76c458;
   font-size: 26rpx;
 }
 .order-details .poup1 > .content3 .wrap1 .wrap1_1.data-v-2b9e2b4a {
@@ -315,7 +315,7 @@ picker-view.data-v-2b9e2b4a {
 }
 .order-details .poup1 > .content3 .wrap1.disabled.data-v-2b9e2b4a {
   border: none;
-  background: #D8D8D8;
+  background: #d8d8d8;
 }
 .order-details .poup1 > .content3 .wrap1.disabled .wrap1_1.data-v-2b9e2b4a {
   color: #626262;
@@ -326,7 +326,7 @@ picker-view.data-v-2b9e2b4a {
   font-size: 16rpx;
 }
 .order-details .poup1 > .content3 .wrap1.active.data-v-2b9e2b4a {
-  background: #76C458;
+  background: #76c458;
 }
 .order-details .poup1 > .content3 .wrap1.active .wrap1_2.data-v-2b9e2b4a {
   color: #fff;
@@ -370,7 +370,7 @@ picker-view.data-v-2b9e2b4a {
   margin-top: 30rpx;
   width: 220rpx;
   height: 84rpx;
-  background: #D8D8D8;
+  background: #d8d8d8;
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -381,7 +381,7 @@ picker-view.data-v-2b9e2b4a {
   font-size: 28rpx;
 }
 .order-details .poup > .content3 .wrap4 .wrap4_2.data-v-2b9e2b4a {
-  color: #BE7E7E;
+  color: #be7e7e;
   font-size: 16rpx;
 }
 .order-details .poup > .content3 .wrap1.data-v-2b9e2b4a {
@@ -390,7 +390,7 @@ picker-view.data-v-2b9e2b4a {
   margin-right: 16rpx;
   font-size: 28rpx;
   border-radius: 32rpx;
-  border: 2rpx solid #76C458;
+  border: 2rpx solid #76c458;
   display: flex;
   justify-content: center;
   align-items: center;
@@ -402,7 +402,7 @@ picker-view.data-v-2b9e2b4a {
 }
 .order-details .poup > .content3 .wrap1.active.data-v-2b9e2b4a {
   color: #fff;
-  background: #76C458;
+  background: #76c458;
 }
 .order-details .poup > .content6.data-v-2b9e2b4a {
   margin-top: 26rpx;
@@ -417,7 +417,7 @@ picker-view.data-v-2b9e2b4a {
   display: flex;
   justify-content: center;
   align-items: center;
-  background: #76C458;
+  background: #76c458;
   border-radius: 30rpx;
 }
 .order-details .poup > .content5.data-v-2b9e2b4a {
@@ -425,15 +425,15 @@ picker-view.data-v-2b9e2b4a {
   height: 66rpx;
   display: flex;
   align-items: center;
-  border-bottom: 1rpx solid #BABABA;
+  border-bottom: 1rpx solid #bababa;
-  border-top: 1rpx solid #BABABA;
+  border-top: 1rpx solid #bababa;
 }
 .order-details .poup > .content5 .wrap1.data-v-2b9e2b4a {
   display: flex;
   justify-content: center;
   align-items: center;
   flex-grow: 1;
-  color: #4E964D;
+  color: #4e964d;
   font-size: 28rpx;
 }
 .order-details .poup > .content5 .wrap2.data-v-2b9e2b4a {
@@ -441,7 +441,7 @@ picker-view.data-v-2b9e2b4a {
   justify-content: center;
   align-items: center;
   flex-grow: 1;
-  color: #4E964D;
+  color: #4e964d;
   font-size: 28rpx;
 }
 .order-details .poup > .content5 .wrap3.data-v-2b9e2b4a {
@@ -449,7 +449,7 @@ picker-view.data-v-2b9e2b4a {
   justify-content: center;
   align-items: center;
   flex-grow: 1;
-  color: #4E964D;
+  color: #4e964d;
   font-size: 28rpx;
 }
 .order-details .poup > .content4.data-v-2b9e2b4a {
@@ -504,7 +504,7 @@ picker-view.data-v-2b9e2b4a {
   margin-top: 60rpx;
 }
 .order-details .content-center .content-scroll > .content4 .wrap1.data-v-2b9e2b4a {
-  border: 1rpx dashed #DFE9F0;
+  border: 1rpx dashed #dfe9f0;
   background-color: #fff;
 }
 .order-details .content-center .content-scroll > .content4 .wrap1 .wrap1_1.data-v-2b9e2b4a {
@@ -547,12 +547,12 @@ picker-view.data-v-2b9e2b4a {
   margin-top: 60rpx;
 }
 .order-details .content-center .content-scroll > .content3 .prompt.data-v-2b9e2b4a {
-  color: #4E964D;
+  color: #4e964d;
   font-size: 16rpx;
   margin-bottom: 4rpx;
 }
 .order-details .content-center .content-scroll > .content3 .wrap1.data-v-2b9e2b4a {
-  border: 1rpx dashed #DFE9F0;
+  border: 1rpx dashed #dfe9f0;
   background-color: #fff;
 }
 .order-details .content-center .content-scroll > .content3 .wrap1 .wrap1_1.data-v-2b9e2b4a {

unpackage/dist/dev/mp-weixin/pages/contract/index.js

@@ -1,2 +1,2 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/contract/index"],{256:function(e,t,n){"use strict";(function(e,t){var r=n(4);n(26);r(n(25));var o=r(n(257));e.__webpack_require_UNI_MP_PLUGIN__=n,t(o.default)}).call(this,n(1)["default"],n(2)["createPage"])},257:function(e,t,n){"use strict";n.r(t);var r=n(258),o=n(260);for(var a in o)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return o[e]}))}(a);n(263);var c,u=n(33),i=Object(u["default"])(o["default"],r["render"],r["staticRenderFns"],!1,null,"3ea6d064",null,!1,r["components"],c);i.options.__file="pages/contract/index.vue",t["default"]=i.exports},258:function(e,t,n){"use strict";n.r(t);var r=n(259);n.d(t,"render",(function(){return r["render"]})),n.d(t,"staticRenderFns",(function(){return r["staticRenderFns"]})),n.d(t,"recyclableRender",(function(){return r["recyclableRender"]})),n.d(t,"components",(function(){return r["components"]}))},259:function(e,t,n){"use strict";var r;n.r(t),n.d(t,"render",(function(){return o})),n.d(t,"staticRenderFns",(function(){return c})),n.d(t,"recyclableRender",(function(){return a})),n.d(t,"components",(function(){return r}));try{r={titleBlock:function(){return n.e("components/title-block/title-block").then(n.bind(null,414))}}}catch(u){if(-1===u.message.indexOf("Cannot find module")||-1===u.message.indexOf(".vue"))throw u;console.error(u.message),console.error("1. 排查组件名称拼写是否正确"),console.error("2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"),console.error("3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件")}var o=function(){var e=this,t=e.$createElement;e._self._c},a=!1,c=[];o._withStripped=!0},260:function(e,t,n){"use strict";n.r(t);var r=n(261),o=n.n(r);for(var a in r)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(a);t["default"]=o.a},261:function(e,t,n){"use strict";(function(e){var r=n(4);Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o=r(n(63)),a=r(n(5)),c=r(n(65)),u=n(262),i=function(){Promise.all([n.e("common/vendor"),n.e("components/uiq-tabbar/uiq-tabbar")]).then(function(){return resolve(n(447))}.bind(null,n)).catch(n.oe)},s={name:"index",components:{tabbar:i},data:function(){return{show:!1,page:1,pageSize:999,mainList:[],elementBottom:""}},onShow:function(){this.getData()},mounted:function(){this.getDistanceFromTopToPageBottom(".content3")},methods:{previewContract:function(t){return(0,c.default)(o.default.mark((function n(){var r,a;return o.default.wrap((function(n){while(1)switch(n.prev=n.next){case 0:return r={ID:t.ID},n.next=3,(0,u.postDataByParams)("/api/warehouse/fdd/pdf/url",r);case 3:a=n.sent,200===a.code&&(e.setStorageSync("jumpUrl",a.data.jumpUrl),e.navigateTo({url:"/pages/signwebview/index"}));case 5:case"end":return n.stop()}}),n)})))()},getDistanceFromTopToPageBottom:function(t){var n=this;return(0,c.default)(o.default.mark((function r(){var c,u,i,s,d,l;return o.default.wrap((function(r){while(1)switch(r.prev=r.next){case 0:return r.next=2,e.getSystemInfo();case 2:return c=r.sent,u=c.windowHeight,i=c.windowWidth,r.next=7,new Promise((function(n){return e.createSelectorQuery().select(t).boundingClientRect().exec(n)}));case 7:s=r.sent,d=(0,a.default)(s,1),l=d[0].top,n.elementBottom=(u-l)/i*750-175;case 11:case"end":return r.stop()}}),r)})))()},loadMore:function(){},getData:function(){var t=this;return(0,c.default)(o.default.mark((function n(){var r,a;return o.default.wrap((function(n){while(1)switch(n.prev=n.next){case 0:return r={page:t.page,pageSize:t.pageSize},n.next=3,(0,u.postDataByParams)("/api/warehouse/list",r);case 3:a=n.sent,200===a.code?t.mainList=a.data.data:e.showToast({title:a.msg,icon:"none"});case 5:case"end":return n.stop()}}),n)})))()}}};t.default=s}).call(this,n(2)["default"])},263:function(e,t,n){"use strict";n.r(t);var r=n(264),o=n.n(r);for(var a in r)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(a);t["default"]=o.a},264:function(e,t,n){}},[[256,"common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/contract/index"],{256:function(e,t,n){"use strict";(function(e,t){var r=n(4);n(26);r(n(25));var o=r(n(257));e.__webpack_require_UNI_MP_PLUGIN__=n,t(o.default)}).call(this,n(1)["default"],n(2)["createPage"])},257:function(e,t,n){"use strict";n.r(t);var r=n(258),o=n(260);for(var a in o)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return o[e]}))}(a);n(263);var c,u=n(33),i=Object(u["default"])(o["default"],r["render"],r["staticRenderFns"],!1,null,"3ea6d064",null,!1,r["components"],c);i.options.__file="pages/contract/index.vue",t["default"]=i.exports},258:function(e,t,n){"use strict";n.r(t);var r=n(259);n.d(t,"render",(function(){return r["render"]})),n.d(t,"staticRenderFns",(function(){return r["staticRenderFns"]})),n.d(t,"recyclableRender",(function(){return r["recyclableRender"]})),n.d(t,"components",(function(){return r["components"]}))},259:function(e,t,n){"use strict";var r;n.r(t),n.d(t,"render",(function(){return o})),n.d(t,"staticRenderFns",(function(){return c})),n.d(t,"recyclableRender",(function(){return a})),n.d(t,"components",(function(){return r}));try{r={titleBlock:function(){return n.e("components/title-block/title-block").then(n.bind(null,430))}}}catch(u){if(-1===u.message.indexOf("Cannot find module")||-1===u.message.indexOf(".vue"))throw u;console.error(u.message),console.error("1. 排查组件名称拼写是否正确"),console.error("2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"),console.error("3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件")}var o=function(){var e=this,t=e.$createElement;e._self._c},a=!1,c=[];o._withStripped=!0},260:function(e,t,n){"use strict";n.r(t);var r=n(261),o=n.n(r);for(var a in r)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(a);t["default"]=o.a},261:function(e,t,n){"use strict";(function(e){var r=n(4);Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o=r(n(63)),a=r(n(5)),c=r(n(65)),u=n(262),i=function(){Promise.all([n.e("common/vendor"),n.e("components/uiq-tabbar/uiq-tabbar")]).then(function(){return resolve(n(463))}.bind(null,n)).catch(n.oe)},s={name:"index",components:{tabbar:i},data:function(){return{show:!1,page:1,pageSize:999,mainList:[],elementBottom:""}},onShow:function(){this.getData()},mounted:function(){this.getDistanceFromTopToPageBottom(".content3")},methods:{previewContract:function(t){return(0,c.default)(o.default.mark((function n(){var r,a;return o.default.wrap((function(n){while(1)switch(n.prev=n.next){case 0:return r={ID:t.ID},n.next=3,(0,u.postDataByParams)("/api/warehouse/fdd/pdf/url",r);case 3:a=n.sent,200===a.code&&(e.setStorageSync("jumpUrl",a.data.jumpUrl),e.navigateTo({url:"/pages/signwebview/index"}));case 5:case"end":return n.stop()}}),n)})))()},getDistanceFromTopToPageBottom:function(t){var n=this;return(0,c.default)(o.default.mark((function r(){var c,u,i,s,d,l;return o.default.wrap((function(r){while(1)switch(r.prev=r.next){case 0:return r.next=2,e.getSystemInfo();case 2:return c=r.sent,u=c.windowHeight,i=c.windowWidth,r.next=7,new Promise((function(n){return e.createSelectorQuery().select(t).boundingClientRect().exec(n)}));case 7:s=r.sent,d=(0,a.default)(s,1),l=d[0].top,n.elementBottom=(u-l)/i*750-175;case 11:case"end":return r.stop()}}),r)})))()},loadMore:function(){},getData:function(){var t=this;return(0,c.default)(o.default.mark((function n(){var r,a;return o.default.wrap((function(n){while(1)switch(n.prev=n.next){case 0:return r={page:t.page,pageSize:t.pageSize},n.next=3,(0,u.postDataByParams)("/api/warehouse/list",r);case 3:a=n.sent,200===a.code?t.mainList=a.data.data:e.showToast({title:a.msg,icon:"none"});case 5:case"end":return n.stop()}}),n)})))()}}};t.default=s}).call(this,n(2)["default"])},263:function(e,t,n){"use strict";n.r(t);var r=n(264),o=n.n(r);for(var a in r)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(a);t["default"]=o.a},264:function(e,t,n){}},[[256,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/contract/index.js.map

unpackage/dist/dev/mp-weixin/pages/home/index.js

@@ -1,2 +1,2 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/home/index"],{248:function(e,n,t){"use strict";(function(e,n){var s=t(4);t(26);s(t(25));var o=s(t(249));e.__webpack_require_UNI_MP_PLUGIN__=t,n(o.default)}).call(this,t(1)["default"],t(2)["createPage"])},249:function(e,n,t){"use strict";t.r(n);var s=t(250),o=t(252);for(var r in o)["default"].indexOf(r)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(r);t(254);var a,i=t(33),c=Object(i["default"])(o["default"],s["render"],s["staticRenderFns"],!1,null,"71e217db",null,!1,s["components"],a);c.options.__file="pages/home/index.vue",n["default"]=c.exports},250:function(e,n,t){"use strict";t.r(n);var s=t(251);t.d(n,"render",(function(){return s["render"]})),t.d(n,"staticRenderFns",(function(){return s["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return s["recyclableRender"]})),t.d(n,"components",(function(){return s["components"]}))},251:function(e,n,t){"use strict";var s;t.r(n),t.d(n,"render",(function(){return o})),t.d(n,"staticRenderFns",(function(){return a})),t.d(n,"recyclableRender",(function(){return r})),t.d(n,"components",(function(){return s}));try{s={titleBlock:function(){return t.e("components/title-block/title-block").then(t.bind(null,414))},uDivider:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-divider/u-divider")]).then(t.bind(null,439))}}}catch(i){if(-1===i.message.indexOf("Cannot find module")||-1===i.message.indexOf(".vue"))throw i;console.error(i.message),console.error("1. 排查组件名称拼写是否正确"),console.error("2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"),console.error("3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件")}var o=function(){var e=this,n=e.$createElement,t=(e._self._c,e.addressList.length);e.$mp.data=Object.assign({},{$root:{g0:t}})},r=!1,a=[];o._withStripped=!0},252:function(e,n,t){"use strict";t.r(n);var s=t(253),o=t.n(s);for(var r in s)["default"].indexOf(r)<0&&function(e){t.d(n,e,(function(){return s[e]}))}(r);n["default"]=o.a},253:function(e,n,t){"use strict";(function(e){var s=t(4);Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o=s(t(63)),r=s(t(65)),a=function(){Promise.all([t.e("common/vendor"),t.e("components/uiq-tabbar/uiq-tabbar")]).then(function(){return resolve(t(447))}.bind(null,t)).catch(t.oe)},i={name:"index",onLoad:function(){e.hideTabBar()},onShow:function(){this.getAddress(),this.pddIsPass()},components:{tabbar:a},data:function(){return{addressList:[],isPass:0}},methods:{scanOrder:function(){return 2!==this.isPass?this.$common.msgToast("护照资料还在审核中"):2!==this.isPass&&4===this.isPass?this.$common.msgToast("资料审核未通过请重新注册"):(e.removeStorageSync("scanlist"),void e.scanCode({onlyFromCamera:!1,success:function(n){console.log("条码类型："+n.scanType),console.log("条码内容："+n.result),e.navigateTo({url:"/pages/scanFeedback/index?url="+n.result})}}))},getAddress:function(){var e=this;return(0,r.default)(o.default.mark((function n(){var t;return o.default.wrap((function(n){while(1)switch(n.prev=n.next){case 0:return n.next=2,e.$api.deposit.address();case 2:t=n.sent,console.log(t),0===t.status?e.addressList=t.data.data:e.$common.msgToast(t.msg);case 5:case"end":return n.stop()}}),n)})))()},goConsignmen:function(){return 2!==this.isPass?this.$common.msgToast("护照资料还在审核中"):2!==this.isPass&&4===this.isPass?this.$common.msgToast("资料审核未通过请重新注册"):void e.navigateTo({url:"/pages/consignment-painting/index"})},pddIsPass:function(){var e=this;return(0,r.default)(o.default.mark((function n(){var t;return o.default.wrap((function(n){while(1)switch(n.prev=n.next){case 0:return n.next=2,e.$api.deposit.fddIsPass();case 2:t=n.sent,0===t.status?e.isPass=t.data.fdd.status:e.$common.msgToast(t.msg);case 4:case"end":return n.stop()}}),n)})))()}}};n.default=i}).call(this,t(2)["default"])},254:function(e,n,t){"use strict";t.r(n);var s=t(255),o=t.n(s);for(var r in s)["default"].indexOf(r)<0&&function(e){t.d(n,e,(function(){return s[e]}))}(r);n["default"]=o.a},255:function(e,n,t){}},[[248,"common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/home/index"],{248:function(e,n,t){"use strict";(function(e,n){var s=t(4);t(26);s(t(25));var o=s(t(249));e.__webpack_require_UNI_MP_PLUGIN__=t,n(o.default)}).call(this,t(1)["default"],t(2)["createPage"])},249:function(e,n,t){"use strict";t.r(n);var s=t(250),o=t(252);for(var r in o)["default"].indexOf(r)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(r);t(254);var a,i=t(33),c=Object(i["default"])(o["default"],s["render"],s["staticRenderFns"],!1,null,"71e217db",null,!1,s["components"],a);c.options.__file="pages/home/index.vue",n["default"]=c.exports},250:function(e,n,t){"use strict";t.r(n);var s=t(251);t.d(n,"render",(function(){return s["render"]})),t.d(n,"staticRenderFns",(function(){return s["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return s["recyclableRender"]})),t.d(n,"components",(function(){return s["components"]}))},251:function(e,n,t){"use strict";var s;t.r(n),t.d(n,"render",(function(){return o})),t.d(n,"staticRenderFns",(function(){return a})),t.d(n,"recyclableRender",(function(){return r})),t.d(n,"components",(function(){return s}));try{s={titleBlock:function(){return t.e("components/title-block/title-block").then(t.bind(null,430))},uDivider:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-divider/u-divider")]).then(t.bind(null,455))}}}catch(i){if(-1===i.message.indexOf("Cannot find module")||-1===i.message.indexOf(".vue"))throw i;console.error(i.message),console.error("1. 排查组件名称拼写是否正确"),console.error("2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"),console.error("3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件")}var o=function(){var e=this,n=e.$createElement,t=(e._self._c,e.addressList.length);e.$mp.data=Object.assign({},{$root:{g0:t}})},r=!1,a=[];o._withStripped=!0},252:function(e,n,t){"use strict";t.r(n);var s=t(253),o=t.n(s);for(var r in s)["default"].indexOf(r)<0&&function(e){t.d(n,e,(function(){return s[e]}))}(r);n["default"]=o.a},253:function(e,n,t){"use strict";(function(e){var s=t(4);Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o=s(t(63)),r=s(t(65)),a=function(){Promise.all([t.e("common/vendor"),t.e("components/uiq-tabbar/uiq-tabbar")]).then(function(){return resolve(t(463))}.bind(null,t)).catch(t.oe)},i={name:"index",onLoad:function(){e.hideTabBar()},onShow:function(){this.getAddress()},components:{tabbar:a},data:function(){return{addressList:[],isPass:0}},methods:{scanOrder:function(){return 2!==this.isPass?this.$common.msgToast("护照资料还在审核中"):2!==this.isPass&&4===this.isPass?this.$common.msgToast("资料审核未通过请重新注册"):(e.removeStorageSync("scanlist"),void e.scanCode({onlyFromCamera:!1,success:function(n){console.log("条码类型："+n.scanType),console.log("条码内容："+n.result),e.navigateTo({url:"/pages/scanFeedback/index?url="+n.result})}}))},getAddress:function(){var e=this;return(0,r.default)(o.default.mark((function n(){var t;return o.default.wrap((function(n){while(1)switch(n.prev=n.next){case 0:return n.next=2,e.$api.deposit.address();case 2:t=n.sent,console.log(t),0===t.status?(e.addressList=t.data.data,e.pddIsPass()):e.$common.msgToast(t.msg);case 5:case"end":return n.stop()}}),n)})))()},goConsignmen:function(){return 2!==this.isPass?this.$common.msgToast("护照资料还在审核中"):2!==this.isPass&&4===this.isPass?this.$common.msgToast("资料审核未通过请重新注册"):void e.navigateTo({url:"/pages/consignment-painting/index"})},pddIsPass:function(){var e=this;return(0,r.default)(o.default.mark((function n(){var t;return o.default.wrap((function(n){while(1)switch(n.prev=n.next){case 0:return n.next=2,e.$api.deposit.fddIsPass();case 2:t=n.sent,0===t.status?e.isPass=t.data.fdd.status:e.$common.msgToast(t.msg);case 4:case"end":return n.stop()}}),n)})))()}}};n.default=i}).call(this,t(2)["default"])},254:function(e,n,t){"use strict";t.r(n);var s=t(255),o=t.n(s);for(var r in s)["default"].indexOf(r)<0&&function(e){t.d(n,e,(function(){return s[e]}))}(r);n["default"]=o.a},255:function(e,n,t){}},[[248,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/home/index.js.map

unpackage/dist/dev/mp-weixin/pages/login/login.json

@@ -1,7 +1,13 @@
 {
+  "navigationStyle": "custom",
   "navigationBarTitleText": "",
   "enablePullDownRefresh": false,
   "usingComponents": {
-    "u-button": "/uview-ui/components/u-button/u-button"
+    "u-navbar": "/uview-ui/components/u-navbar/u-navbar",
+    "u--input": "/uview-ui/components/u--input/u--input",
+    "u-checkbox-group": "/uview-ui/components/u-checkbox-group/u-checkbox-group",
+    "u-checkbox": "/uview-ui/components/u-checkbox/u-checkbox",
+    "u-button": "/uview-ui/components/u-button/u-button",
+    "u-code-input": "/uview-ui/components/u-code-input/u-code-input"
   }
 }

unpackage/dist/dev/mp-weixin/pages/login/login.wxml

@@ -1 +1 @@
-<view class="main data-v-b237504c"><view data-event-opts="{{[['tap',[['goRouter',['$event']]]]]}}" class="ykfw data-v-b237504c" bindtap="__e">游客访问</view><image class="logo data-v-b237504c" src="/static/image/logo.png" mode="scaleToFill"></image><view class="btn data-v-b237504c"><block wx:if="{{isShow}}"><u-button vue-id="35a7246c-1" open-type="getPhoneNumber" color="transparent" text="点击登录" data-event-opts="{{[['^getphonenumber',[['getPhoneNumber']]]]}}" bind:getphonenumber="__e" class="data-v-b237504c" bind:__l="__l"></u-button></block></view></view>
+<view class="bg data-v-b237504c"><u-navbar vue-id="35a7246c-1" title=" " bgColor="transparent" leftIconSize="{{isShowCaptcha?20:0}}" data-event-opts="{{[['^leftClick',[['back']]]]}}" bind:leftClick="__e" class="data-v-b237504c" bind:__l="__l"></u-navbar><view class="main-wrapper data-v-b237504c"><view class="main data-v-b237504c"><view class="title-wrapper data-v-b237504c"><view class="title data-v-b237504c"><view class="title-01 data-v-b237504c">登录</view><view class="title-02 data-v-b237504c">品之鉴</view></view><view class="title-wrapper__desc data-v-b237504c">若为未注册账号则将自动转入品之鉴注册页</view></view><transition-group vue-id="35a7246c-2" name="fade" class="data-v-b237504c" bind:__l="__l" vue-slots="{{['default']}}"><view hidden="{{!(!isShowCaptcha)}}" class="phone-login-wrapper data-v-b237504c"><view class="phone-wrapper data-v-b237504c"><view class="name data-v-b237504c">手机号</view><u--input vue-id="{{('35a7246c-3')+','+('35a7246c-2')}}" placeholder="请输入手机号" border="none" focus="{{true}}" value="{{phone}}" data-event-opts="{{[['^change',[['handleChange']]],['^input',[['__set_model',['','phone','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-b237504c" bind:__l="__l"></u--input></view><view class="agreement-wrapper data-v-b237504c"><u-checkbox-group vue-id="{{('35a7246c-4')+','+('35a7246c-2')}}" iconPlacement="left" placement="row" inactiveColor="#76C458" value="{{checked}}" data-event-opts="{{[['^change',[['handleChange']]],['^input',[['__set_model',['','checked','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-b237504c" bind:__l="__l" vue-slots="{{['default']}}"><u-checkbox vue-id="{{('35a7246c-5')+','+('35a7246c-4')}}" name="yes" shape="circle" activeColor="#76C458" class="data-v-b237504c" bind:__l="__l"></u-checkbox><view class="know data-v-b237504c">已阅读并同意<text data-event-opts="{{[['tap',[['agreementHandle',['service']]]]]}}" bindtap="__e" class="data-v-b237504c">《软件许可及服务协议》</text><text data-event-opts="{{[['tap',[['agreementHandle',['privacy']]]]]}}" bindtap="__e" class="data-v-b237504c">&《隐私保护政策》</text></view></u-checkbox-group></view><view data-event-opts="{{[['tap',[['getCaptcha',['$event']]]]]}}" class="captcha-btn data-v-b237504c" style="{{'background:'+(disabled?'#dadadc':'#76c558')+';'}}" bindtap="__e">获取验证码</view><view class="btns-wrapper data-v-b237504c"><view class="btns-wrapper__weixin data-v-b237504c"><block wx:if="{{isShow}}"><u-button vue-id="{{('35a7246c-6')+','+('35a7246c-2')}}" open-type="getPhoneNumber" color="transparent" text="微信登录" data-event-opts="{{[['^getphonenumber',[['getPhoneNumber']]]]}}" bind:getphonenumber="__e" class="data-v-b237504c" bind:__l="__l"></u-button></block></view><view data-event-opts="{{[['tap',[['goRouter',['$event']]]]]}}" class="btns-wrapper__youke data-v-b237504c" bindtap="__e">游客访问</view></view></view><view hidden="{{!(isShowCaptcha)}}" class="fill-captcha-wrapper data-v-b237504c"><view class="fill-captcha-wrapper__tip data-v-b237504c"><view class="tip-01 data-v-b237504c">已发送验证码至</view><view class="tip-02 data-v-b237504c">{{phone}}</view></view><view class="{{['form-view-class','data-v-b237504c',captcha?'code_login_ipt':'']}}"><u-code-input vue-id="{{('35a7246c-7')+','+('35a7246c-2')}}" maxlength="{{6}}" space="{{5}}" focus="{{true}}" value="{{captcha}}" data-event-opts="{{[['^finish',[['handleFinish']]],['^input',[['__set_model',['','captcha','$event',[]]]]]]}}" bind:finish="__e" bind:input="__e" class="data-v-b237504c" bind:__l="__l"></u-code-input></view><view class="resend-wrapper data-v-b237504c" style="{{'color:'+(timer===null?'#76c558':'#8d8d8d')+';'}}"><view data-event-opts="{{[['tap',[['resendCaptcha',['$event']]]]]}}" bindtap="__e" class="data-v-b237504c">重新发送</view><block wx:if="{{timer!==null}}"><view class="data-v-b237504c">{{"("+time+"s)"}}</view></block></view></view></transition-group></view></view></view>

unpackage/dist/dev/mp-weixin/pages/login/login.wxss

@@ -27,57 +27,188 @@
 .data-v-b237504c .u-button {
   background: red;
 }
-.main.data-v-b237504c {
+.bg.data-v-b237504c {
-  background: url("https://cdns.fontree.cn/fonchain-main/prod/image/1381bd18-2f0c-49f1-84f6-d3eceb94f7a7/artwork/6ef00a09-f663-451d-ae0c-0d00cf4068c5.png");
+  background: url("https://e-cdn.fontree.cn/fonchain-main/prod/image/6248/avatar/8178c309-54da-4e45-89d1-25c3f0cc80e9.png");
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
   height: 100vh;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  position: relative;
 }
-.main .ykfw.data-v-b237504c {
+.bg .ykfw.data-v-b237504c {
   height: 50rpx;
   position: absolute;
   top: 20rpx;
   right: 40rpx;
   color: #fff;
 }
-.main .logo.data-v-b237504c {
+.bg .back-wrapper.data-v-b237504c {
-  margin-top: 250rpx;
+  width: 100%;
-  width: 398rpx;
+  height: 200rpx;
-  height: 744rpx;
+  box-sizing: border-box;
+  padding-top: 40rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
-.main uni-button.data-v-b237504c:after {
+.bg .back-wrapper .back-inner.data-v-b237504c {
+  width: 80vw;
+}
+.bg .back-wrapper .back-inner .back.data-v-b237504c {
+  width: 50rpx;
+  height: 50rpx;
+  border-radius: 50%;
+  background-color: #76c558;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.bg .main-wrapper.data-v-b237504c {
+  width: 100%;
+  height: calc(100vh - 300rpx);
+  display: flex;
+  justify-content: center;
+}
+.bg .main-wrapper .main.data-v-b237504c {
+  width: 80vw;
+  height: 670rpx;
+}
+.bg .main-wrapper .main .title-wrapper.data-v-b237504c {
+  margin-top: 400rpx;
+}
+.bg .main-wrapper .main .title-wrapper .title.data-v-b237504c {
+  font-size: 20px;
+  font-weight: bold;
+  display: flex;
+}
+.bg .main-wrapper .main .title-wrapper .title .title-02.data-v-b237504c {
+  color: #76c558;
+}
+.bg .main-wrapper .main .title-wrapper__desc.data-v-b237504c {
+  color: #8d8d8d;
+}
+.bg .main-wrapper .main .phone-login-wrapper.data-v-b237504c {
+  margin-top: 100rpx;
+}
+.bg .main-wrapper .main .phone-login-wrapper .phone-wrapper.data-v-b237504c {
+  box-sizing: border-box;
+  background: #ffffff;
+  border-radius: 20rpx;
+  width: 100%;
+  height: 92rpx;
+  display: flex;
+  align-items: center;
+  padding-left: 24rpx;
+}
+.bg .main-wrapper .main .phone-login-wrapper .phone-wrapper .name.data-v-b237504c {
+  width: 120rpx;
+  height: 72rpx;
+  line-height: 72rpx;
+  border-right: 1rpx solid #d1d1d1;
+}
+.bg .main-wrapper .main .phone-login-wrapper .phone-wrapper.data-v-b237504c .u-input {
+  margin-left: 40rpx;
+}
+.bg .main-wrapper .main .phone-login-wrapper .agreement-wrapper.data-v-b237504c {
+  font-size: 28rpx;
+  margin: 46rpx 0 10rpx 0;
+}
+.bg .main-wrapper .main .phone-login-wrapper .agreement-wrapper .know.data-v-b237504c {
+  margin-top: 20rpx;
+  font-size: 28rpx;
+  color: #8d8d8d;
+}
+.bg .main-wrapper .main .phone-login-wrapper .agreement-wrapper .know text.data-v-b237504c {
+  color: #76c458;
+}
+.bg .main-wrapper .main .phone-login-wrapper .captcha-btn.data-v-b237504c {
+  width: 100%;
+  height: 92rpx;
+  box-sizing: border-box;
+  border-radius: 20rpx;
+  color: #fff;
+  background-color: #dadadc;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.bg .main-wrapper .main .phone-login-wrapper .btns-wrapper.data-v-b237504c {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-top: 10rpx;
+}
+.bg .main-wrapper .main .phone-login-wrapper .btns-wrapper__weixin.data-v-b237504c .u-button {
+  padding-left: 0 !important;
+  padding-right: 0 !important;
+  font-size: 30rpx !important;
+  color: #76c558 !important;
+}
+.bg .main-wrapper .main .phone-login-wrapper .btns-wrapper__youke.data-v-b237504c {
+  font-size: 30rpx;
+  color: #fff;
+}
+.bg .main-wrapper .main .fill-captcha-wrapper.data-v-b237504c {
+  margin-top: 50rpx;
+}
+.bg .main-wrapper .main .fill-captcha-wrapper__tip.data-v-b237504c {
+  height: 40rpx;
+  display: flex;
+  margin-bottom: 10rpx;
+}
+.bg .main-wrapper .main .fill-captcha-wrapper__tip .tip-01.data-v-b237504c {
+  color: #8d8d8d;
+}
+.bg .main-wrapper .main .fill-captcha-wrapper__tip .tip-02.data-v-b237504c {
+  margin-left: 16rpx;
+}
+.bg .main-wrapper .main .fill-captcha-wrapper .form-view-class.data-v-b237504c {
+  width: 100%;
+  box-sizing: border-box;
+  position: relative;
+}
+.bg .main-wrapper .main .fill-captcha-wrapper .form-view-class.data-v-b237504c .u-code-input {
+  display: flex;
+  justify-content: space-between;
+}
+.bg .main-wrapper .main .fill-captcha-wrapper .form-view-class.data-v-b237504c .u-code-input .u-code-input__item {
+  width: calc(80vw / 7) !important;
+  height: 92rpx !important;
+  background-color: #ffffff !important;
+  border: none !important;
+  border-radius: 20rpx;
+}
+.bg .main-wrapper .main .fill-captcha-wrapper .form-view-class.data-v-b237504c .u-code-input .u-code-input__item:first-child .u-code-input__item__cursor {
+  width: 0px !important;
+}
+.bg .main-wrapper .main .fill-captcha-wrapper .form-view-class.data-v-b237504c .u-code-input .u-code-input__input {
+  height: 92rpx !important;
+  width: 100%;
+  left: 20px;
+}
+.bg .main-wrapper .main .fill-captcha-wrapper .code_login_ipt.data-v-b237504c .u-code-input__input {
+  height: 100% !important;
+  width: 0 !important;
+  left: -999rpx !important;
+}
+.bg .main-wrapper .main .fill-captcha-wrapper .resend-wrapper.data-v-b237504c {
+  display: flex;
+  margin-top: 10rpx;
+}
+.bg .main-wrapper .main .fade-enter.data-v-b237504c,
+.bg .main-wrapper .main .fade-leave-to.data-v-b237504c {
+  -webkit-transform: translateX(100%);
+          transform: translateX(100%);
+}
+.bg .main-wrapper .main .fade-enter-active.data-v-b237504c,
+.bg .main-wrapper .main .fade-leave-active.data-v-b237504c {
+  transition: 0.5 linear;
+}
+.bg .main-wrapper .main .fade-enter-to.data-v-b237504c,
+.bg .main-wrapper .main .fade-leave.data-v-b237504c {
+  -webkit-transform: translateX(0);
+          transform: translateX(0);
+}
+.bg uni-button.data-v-b237504c:after {
   border: 0px;
 }
-.main .btn.data-v-b237504c {
-  background: transparent;
-  width: 200rpx;
-  position: fixed;
-  bottom: 15%;
-  color: #fff;
-  left: 50%;
-  -webkit-transform: translateX(-50%);
-          transform: translateX(-50%);
-  font-size: 30rpx;
-  transition: all 1s;
-  -webkit-animation: jump-data-v-b237504c 1s ease-in-out infinite alternate;
-          animation: jump-data-v-b237504c 1s ease-in-out infinite alternate;
-}
-@-webkit-keyframes jump-data-v-b237504c {
-from {
-    bottom: 16%;
-}
-to {
-    bottom: 15%;
-}
-}
-@keyframes jump-data-v-b237504c {
-from {
-    bottom: 16%;
-}
-to {
-    bottom: 15%;
-}
-}
 

unpackage/dist/dev/mp-weixin/pages/mine/index.js

@@ -1,2 +1,2 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/mine/index"],{296:function(n,e,t){"use strict";(function(n,e){var r=t(4);t(26);r(t(25));var a=r(t(297));n.__webpack_require_UNI_MP_PLUGIN__=t,e(a.default)}).call(this,t(1)["default"],t(2)["createPage"])},297:function(n,e,t){"use strict";t.r(e);var r=t(298),a=t(300);for(var u in a)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return a[n]}))}(u);t(302);var o,i=t(33),c=Object(i["default"])(a["default"],r["render"],r["staticRenderFns"],!1,null,"4bd6864f",null,!1,r["components"],o);c.options.__file="pages/mine/index.vue",e["default"]=c.exports},298:function(n,e,t){"use strict";t.r(e);var r=t(299);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},299:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return a})),t.d(e,"staticRenderFns",(function(){return o})),t.d(e,"recyclableRender",(function(){return u})),t.d(e,"components",(function(){return r}));var a=function(){var n=this,e=n.$createElement;n._self._c},u=!1,o=[];a._withStripped=!0},300:function(n,e,t){"use strict";t.r(e);var r=t(301),a=t.n(r);for(var u in r)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(u);e["default"]=a.a},301:function(n,e,t){"use strict";(function(n){var r=t(4);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var a,u=r(t(63)),o=r(t(11)),i=r(t(65)),c=function(){Promise.all([t.e("common/vendor"),t.e("components/uiq-tabbar/uiq-tabbar")]).then(function(){return resolve(t(447))}.bind(null,t)).catch(t.oe)},s=(a={name:"index",onLoad:function(){n.hideTabBar()},components:{tabbar:c},data:function(){return{orderTotal:0,validContractDays:0,nickName:"",telNum:"",avatar:""}}},(0,o.default)(a,"onLoad",(function(){this.infoOrders(),this.info()})),(0,o.default)(a,"onShow",(function(){this.infoOrders()})),(0,o.default)(a,"methods",{infoOrders:function(){var n=this;return(0,i.default)(u.default.mark((function e(){var t;return u.default.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.next=2,n.$api.mine.infoOrders();case 2:t=e.sent,0===t.status?(n.orderTotal=t.data.totalCount,n.validContractDays=t.data.nearCount):n.$common.msgToast(t.msg);case 4:case"end":return e.stop()}}),e)})))()},info:function(){var n=this;return(0,i.default)(u.default.mark((function e(){var t;return u.default.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.next=2,n.$api.mine.info();case 2:t=e.sent,0===t.status?(n.nickName=t.data.user.nickName,n.telNum=t.data.user.telNum,n.avatar=t.data.user.avatar):n.$common.msgToast(t.msg);case 4:case"end":return e.stop()}}),e)})))()},goSet:function(){n.navigateTo({url:"/pages/mine/set-up"})}}),a);e.default=s}).call(this,t(2)["default"])},302:function(n,e,t){"use strict";t.r(e);var r=t(303),a=t.n(r);for(var u in r)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(u);e["default"]=a.a},303:function(n,e,t){}},[[296,"common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/mine/index"],{296:function(n,e,t){"use strict";(function(n,e){var r=t(4);t(26);r(t(25));var a=r(t(297));n.__webpack_require_UNI_MP_PLUGIN__=t,e(a.default)}).call(this,t(1)["default"],t(2)["createPage"])},297:function(n,e,t){"use strict";t.r(e);var r=t(298),a=t(300);for(var u in a)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return a[n]}))}(u);t(302);var o,i=t(33),c=Object(i["default"])(a["default"],r["render"],r["staticRenderFns"],!1,null,"4bd6864f",null,!1,r["components"],o);c.options.__file="pages/mine/index.vue",e["default"]=c.exports},298:function(n,e,t){"use strict";t.r(e);var r=t(299);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},299:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return a})),t.d(e,"staticRenderFns",(function(){return o})),t.d(e,"recyclableRender",(function(){return u})),t.d(e,"components",(function(){return r}));var a=function(){var n=this,e=n.$createElement;n._self._c},u=!1,o=[];a._withStripped=!0},300:function(n,e,t){"use strict";t.r(e);var r=t(301),a=t.n(r);for(var u in r)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(u);e["default"]=a.a},301:function(n,e,t){"use strict";(function(n){var r=t(4);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var a,u=r(t(63)),o=r(t(11)),i=r(t(65)),c=function(){Promise.all([t.e("common/vendor"),t.e("components/uiq-tabbar/uiq-tabbar")]).then(function(){return resolve(t(463))}.bind(null,t)).catch(t.oe)},s=(a={name:"index",onLoad:function(){n.hideTabBar()},components:{tabbar:c},data:function(){return{orderTotal:0,validContractDays:0,nickName:"",telNum:"",avatar:""}}},(0,o.default)(a,"onLoad",(function(){this.infoOrders(),this.info()})),(0,o.default)(a,"onShow",(function(){this.infoOrders()})),(0,o.default)(a,"methods",{infoOrders:function(){var n=this;return(0,i.default)(u.default.mark((function e(){var t;return u.default.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.next=2,n.$api.mine.infoOrders();case 2:t=e.sent,0===t.status?(n.orderTotal=t.data.totalCount,n.validContractDays=t.data.nearCount):n.$common.msgToast(t.msg);case 4:case"end":return e.stop()}}),e)})))()},info:function(){var n=this;return(0,i.default)(u.default.mark((function e(){var t;return u.default.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.next=2,n.$api.mine.info();case 2:t=e.sent,0===t.status?(n.nickName=t.data.user.nickName,n.telNum=t.data.user.telNum,n.avatar=t.data.user.avatar):n.$common.msgToast(t.msg);case 4:case"end":return e.stop()}}),e)})))()},goSet:function(){n.navigateTo({url:"/pages/mine/set-up"})}}),a);e.default=s}).call(this,t(2)["default"])},302:function(n,e,t){"use strict";t.r(e);var r=t(303),a=t.n(r);for(var u in r)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(u);e["default"]=a.a},303:function(n,e,t){}},[[296,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/mine/index.js.map

unpackage/dist/dev/mp-weixin/pages/mine/set-up.json

@@ -5,6 +5,7 @@
   "usingComponents": {
     "title-block": "/components/title-block/title-block",
     "u-upload": "/uview-ui/components/u-upload/u-upload",
-    "u-button": "/uview-ui/components/u-button/u-button"
+    "u-button": "/uview-ui/components/u-button/u-button",
+    "u-modal": "/uview-ui/components/u-modal/u-modal"
   }
 }

unpackage/dist/dev/mp-weixin/pages/mine/set-up.wxml

@@ -1 +1 @@
-<view class="set-up _div data-v-6d897039"><title-block vue-id="43a517ed-1" title="设置" class="data-v-6d897039" bind:__l="__l" vue-slots="{{['left']}}"><view class="_div data-v-6d897039" slot="left"><image style="width:112rpx;height:52rpx;" src="https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/785cf885-c4c9-44b3-8155-4b39988c7ef8.png" data-event-opts="{{[['tap',[['back',['$event']]]]]}}" bindtap="__e" class="data-v-6d897039"></image></view></title-block><view class="content2 _div data-v-6d897039"><view class="wrap1 _div data-v-6d897039"><image src="{{user.avatar?user.avatar:'https://cdns.fontree.cn/fonchain-main/prod/image/407e7c22-eb62-411e-957b-b6c296fde530/artwork/814ac246-e1eb-49fe-beee-dd53aaf5d309.png'}}" mode="scaleToFill" class="data-v-6d897039"></image></view><view class="wrap2 _div data-v-6d897039"><view data-event-opts="{{[['tap',[['backDafult',['$event']]]]]}}" class="wrap2_1 _div data-v-6d897039" bindtap="__e">恢复默认头像</view><u-upload vue-id="43a517ed-2" fileList="{{fileList}}" name="1" multiple="{{true}}" maxCount="{{1}}" data-event-opts="{{[['^afterRead',[['changeAvatar']]]]}}" bind:afterRead="__e" class="data-v-6d897039" bind:__l="__l" vue-slots="{{['default']}}"><view style="width:348rpx;height:56rpx;margin-top:20rpx;" class="data-v-6d897039"><u-button class="size data-v-6d897039" vue-id="{{('43a517ed-3')+','+('43a517ed-2')}}" text="更换头像" shape="circle" color="#76C458" bind:__l="__l"></u-button></view></u-upload></view></view><view class="content3 _div data-v-6d897039"><view class="wrap1 _div data-v-6d897039"><view class="wrap1_1 _div data-v-6d897039"><view class="wrap1_1_1 _div data-v-6d897039">姓名</view><view class="wrap1_1_2 _div data-v-6d897039">{{user.nickName}}</view><view class="wrap1_1_3 _div data-v-6d897039"><view class="data-v-6d897039"></view></view><view class="wrap1_1_4 _div data-v-6d897039"></view></view><view class="wrap1_1 _div data-v-6d897039"><view class="wrap1_1_1 _div data-v-6d897039">{{''+(user.idType==="0"?"身份证号":"护照号")+''}}</view><view class="wrap1_1_2 _div data-v-6d897039">{{''+(user.idType==="0"?user.iDNum:user.passport.idNum)+''}}</view><view class="wrap1_1_3 _div data-v-6d897039"><view class="data-v-6d897039"></view></view><view class="wrap1_1_4 _div data-v-6d897039"></view></view><view class="wrap1_1 _div data-v-6d897039"><view class="wrap1_1_1 _div data-v-6d897039">手机号</view><view class="wrap1_1_2 _div data-v-6d897039">{{user.telNum}}</view><view class="wrap1_1_3 _div data-v-6d897039"><view class="data-v-6d897039"></view></view></view></view><view class="wrap2 _div data-v-6d897039"></view></view><view class="content4 _div data-v-6d897039"><view data-event-opts="{{[['tap',[['logout',['$event']]]]]}}" class="wrap1 _div data-v-6d897039" bindtap="__e">注销账号</view></view></view>
+<view class="set-up _div data-v-6d897039"><title-block vue-id="43a517ed-1" title="设置" class="data-v-6d897039" bind:__l="__l" vue-slots="{{['left']}}"><view class="_div data-v-6d897039" slot="left"><image style="width:112rpx;height:52rpx;" src="https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/785cf885-c4c9-44b3-8155-4b39988c7ef8.png" data-event-opts="{{[['tap',[['back',['$event']]]]]}}" bindtap="__e" class="data-v-6d897039"></image></view></title-block><view class="content2 _div data-v-6d897039"><view class="wrap1 _div data-v-6d897039"><image src="{{user.avatar?user.avatar:'https://cdns.fontree.cn/fonchain-main/prod/image/407e7c22-eb62-411e-957b-b6c296fde530/artwork/814ac246-e1eb-49fe-beee-dd53aaf5d309.png'}}" mode="scaleToFill" class="data-v-6d897039"></image></view><view class="wrap2 _div data-v-6d897039"><view data-event-opts="{{[['tap',[['backDafult',['$event']]]]]}}" class="wrap2_1 _div data-v-6d897039" bindtap="__e">恢复默认头像</view><u-upload vue-id="43a517ed-2" fileList="{{fileList}}" name="1" multiple="{{true}}" maxCount="{{1}}" data-event-opts="{{[['^afterRead',[['changeAvatar']]]]}}" bind:afterRead="__e" class="data-v-6d897039" bind:__l="__l" vue-slots="{{['default']}}"><view style="width:348rpx;height:56rpx;margin-top:20rpx;" class="data-v-6d897039"><u-button class="size data-v-6d897039" vue-id="{{('43a517ed-3')+','+('43a517ed-2')}}" text="更换头像" shape="circle" color="#76C458" bind:__l="__l"></u-button></view></u-upload></view></view><view class="content3 _div data-v-6d897039"><view class="wrap1 _div data-v-6d897039"><view class="wrap1_1 _div data-v-6d897039"><view class="wrap1_1_1 _div data-v-6d897039">姓名</view><view class="wrap1_1_2 _div data-v-6d897039">{{user.nickName}}</view><view class="wrap1_1_3 _div data-v-6d897039"><view class="data-v-6d897039"></view></view><view class="wrap1_1_4 _div data-v-6d897039"></view></view><view class="wrap1_1 _div data-v-6d897039"><view class="wrap1_1_1 _div data-v-6d897039">{{''+(user.idType==='0'?'身份证号':'护照号')+''}}</view><view class="wrap1_1_2 _div data-v-6d897039">{{''+(user.idType==='0'?user.iDNum:user.passport.idNum)+''}}</view><view class="wrap1_1_3 _div data-v-6d897039"><view class="data-v-6d897039"></view></view><view class="wrap1_1_4 _div data-v-6d897039"></view></view><view class="wrap1_1 _div data-v-6d897039"><view class="wrap1_1_1 _div data-v-6d897039">手机号</view><view class="wrap1_1_2 _div data-v-6d897039">{{user.telNum}}</view><view class="wrap1_1_3 _div data-v-6d897039"><view class="data-v-6d897039"></view></view></view></view><view class="wrap2 _div data-v-6d897039"></view></view><view class="content4 _div data-v-6d897039"><view data-event-opts="{{[['tap',[['signOff',['$event']]]]]}}" class="wrap1 _div data-v-6d897039" bindtap="__e">注销账号</view></view><view class="content5 _div data-v-6d897039"><view data-event-opts="{{[['tap',[['logout',['$event']]]]]}}" class="wrap1 _div data-v-6d897039" bindtap="__e">退出登录</view></view><u-modal vue-id="43a517ed-4" show="{{showSignOff}}" title="注销账号" content="您确定要注销该账号吗？" showCancelButton="{{true}}" asyncClose="{{true}}" data-event-opts="{{[['^confirm',[['confirmSignOff']]],['^cancel',[['cancelSignOff']]]]}}" bind:confirm="__e" bind:cancel="__e" class="data-v-6d897039" bind:__l="__l"></u-modal></view>

unpackage/dist/dev/mp-weixin/pages/mine/set-up.wxss

@@ -39,7 +39,7 @@
   left: 50%;
   -webkit-transform: translateX(-50%);
           transform: translateX(-50%);
-  bottom: 104rpx;
+  bottom: 200rpx;
   position: absolute;
   display: flex;
 }
@@ -56,6 +56,25 @@
   background: #3e3e3e;
 }
 .set-up .content4 .wrap1.data-v-6d897039 {
+  color: #fff;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 32rpx;
+  border-radius: 40rpx;
+  width: 292rpx;
+  height: 56rpx;
+  background: #a8a8a8;
+}
+.set-up .content5.data-v-6d897039 {
+  left: 50%;
+  -webkit-transform: translateX(-50%);
+          transform: translateX(-50%);
+  bottom: 100rpx;
+  position: absolute;
+  display: flex;
+}
+.set-up .content5 .wrap1.data-v-6d897039 {
   color: #fff;
   display: flex;
   justify-content: center;

unpackage/dist/dev/mp-weixin/pages/order-goods/index.wxss

@@ -54,7 +54,7 @@
   align-items: center;
   height: 228rpx;
   width: 154rpx;
-  background-color: #B7C0C8;
+  background-color: #b7c0c8;
   right: -144rpx;
   position: absolute;
   z-index: -1;
@@ -75,34 +75,34 @@
   color: #939393;
 }
 .order-goods .content3 .wrap1 .wrap1_3.status1.data-v-c0c42e9e {
-  background: #FFBA00;
+  background: #ffba00;
 }
 .order-goods .content3 .wrap1 .wrap1_3.status1 .wrap1_3_3_1.data-v-c0c42e9e {
-  color: #FFBA00;
+  color: #ffba00;
 }
 .order-goods .content3 .wrap1 .wrap1_3.status2.data-v-c0c42e9e {
-  background: #76C458;
+  background: #76c458;
 }
 .order-goods .content3 .wrap1 .wrap1_3.status2 .wrap1_3_3_1.data-v-c0c42e9e {
-  color: #76C458;
+  color: #76c458;
 }
 .order-goods .content3 .wrap1 .wrap1_3.status7.data-v-c0c42e9e {
-  background: #76C458;
+  background: #76c458;
 }
 .order-goods .content3 .wrap1 .wrap1_3.status7 .wrap1_3_3_1.data-v-c0c42e9e {
   font-size: 23rpx !important;
 }
 .order-goods .content3 .wrap1 .wrap1_3.status3.data-v-c0c42e9e {
-  background: #76C458;
+  background: #76c458;
 }
 .order-goods .content3 .wrap1 .wrap1_3.status3 .wrap1_3_3_1.data-v-c0c42e9e {
-  color: #FF4848;
+  color: #ff4848;
 }
 .order-goods .content3 .wrap1 .wrap1_3.status4.data-v-c0c42e9e {
-  background: #FF4848;
+  background: #ff4848;
 }
 .order-goods .content3 .wrap1 .wrap1_3.status4 .wrap1_3_3_1.data-v-c0c42e9e {
-  color: #FF4848;
+  color: #ff4848;
 }
 .order-goods .content3 .wrap1 .wrap1_3 .wrap1_3_4.data-v-c0c42e9e {
   display: flex;
@@ -169,11 +169,11 @@
 }
 .order-goods .content3 .wrap1 .wrap1_3 .wrap1_3_1 .wrap1_3_1_1.data-v-c0c42e9e {
   font-size: 16rpx;
-  color: #FF4848;
+  color: #ff4848;
 }
 .order-goods .content3 .wrap1 .wrap1_3 .wrap1_3_1 .wrap1_3_1_2.data-v-c0c42e9e {
   font-size: 24rpx;
-  color: #FF4848;
+  color: #ff4848;
 }
 .order-goods .content3 .wrap1 .wrap1_3 .wrap1_3_1 .wrap1_3_1_3.data-v-c0c42e9e {
   display: flex;
@@ -208,7 +208,7 @@
   font-size: 24rpx;
 }
 .order-goods .content3 .wrap1 .wrap1_2 .wrap1_2_4.data-v-c0c42e9e {
-  color: #FF4848;
+  color: #ff4848;
   font-size: 24rpx;
 }
 .order-goods .content3 .wrap1 .wrap1_1 image.data-v-c0c42e9e {
@@ -229,7 +229,7 @@
   font-size: 20rpx;
   width: 94rpx;
   height: 52rpx;
-  background-color: #4E964D;
+  background-color: #4e964d;
 }
 .order-goods .content2 .wrap1.data-v-c0c42e9e {
   align-items: center;
@@ -262,7 +262,7 @@
   color: #fff;
   width: 132rpx;
   height: 52rpx;
-  background-color: #76C458;
+  background-color: #76c458;
   display: flex;
   justify-content: center;
   align-items: center;
@@ -274,11 +274,11 @@
   align-items: center;
 }
 .order-goods .content1 .wrap2 .wrap2_1.data-v-c0c42e9e {
-  color: #4E964D;
+  color: #4e964d;
   font-size: 32rpx;
 }
 .order-goods .content1 .wrap2 .wrap2_2.data-v-c0c42e9e {
-  color: #7C9F6F;
+  color: #7c9f6f;
   font-size: 16rpx;
 }
 .order-goods .content1 .wrap1 .wrap1_1.data-v-c0c42e9e {
@@ -286,7 +286,7 @@
   border-radius: 20rpx;
   width: 156rpx;
   height: 52rpx;
-  background-color: #4E964D;
+  background-color: #4e964d;
   color: #fff;
   font-size: 24rpx;
   display: flex;

unpackage/dist/dev/mp-weixin/pages/order-goods/order-details.js

@@ -1,2 +1,2 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/order-goods/order-details"],{288:function(e,t,n){"use strict";(function(e,t){var r=n(4);n(26);r(n(25));var o=r(n(289));e.__webpack_require_UNI_MP_PLUGIN__=n,t(o.default)}).call(this,n(1)["default"],n(2)["createPage"])},289:function(e,t,n){"use strict";n.r(t);var r=n(290),o=n(292);for(var a in o)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return o[e]}))}(a);n(294);var c,u=n(33),i=Object(u["default"])(o["default"],r["render"],r["staticRenderFns"],!1,null,"725951bc",null,!1,r["components"],c);i.options.__file="pages/order-goods/order-details.vue",t["default"]=i.exports},290:function(e,t,n){"use strict";n.r(t);var r=n(291);n.d(t,"render",(function(){return r["render"]})),n.d(t,"staticRenderFns",(function(){return r["staticRenderFns"]})),n.d(t,"recyclableRender",(function(){return r["recyclableRender"]})),n.d(t,"components",(function(){return r["components"]}))},291:function(e,t,n){"use strict";var r;n.r(t),n.d(t,"render",(function(){return o})),n.d(t,"staticRenderFns",(function(){return c})),n.d(t,"recyclableRender",(function(){return a})),n.d(t,"components",(function(){return r}));try{r={titleBlock:function(){return n.e("components/title-block/title-block").then(n.bind(null,414))}}}catch(u){if(-1===u.message.indexOf("Cannot find module")||-1===u.message.indexOf(".vue"))throw u;console.error(u.message),console.error("1. 排查组件名称拼写是否正确"),console.error("2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"),console.error("3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件")}var o=function(){var e=this,t=e.$createElement,n=(e._self._c,e.statusValue.find((function(t){return t.value===e.info.artworkStatus}))),r=e.statusValue.find((function(t){return t.value===e.info.artworkStatus})),o=1!==e.info.artworkStatus?e.info.startAt.replaceAll("-",".")||"":null,a=1!==e.info.artworkStatus?e.info.endAt.replaceAll("-",".")||"":null;e.$mp.data=Object.assign({},{$root:{g0:n,g1:r,g2:o,g3:a}})},a=!1,c=[];o._withStripped=!0},292:function(e,t,n){"use strict";n.r(t);var r=n(293),o=n.n(r);for(var a in r)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(a);t["default"]=o.a},293:function(e,t,n){"use strict";(function(e){var r=n(4);Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o=r(n(63)),a=r(n(65)),c=n(262),u={name:"order-details",data:function(){return{distance:"",ID:"",info:{},statusValue:[{label:"全部状态",value:0},{label:"待入库",value:1,style:"color: #FFBA00;font-size: 24rpx"},{label:"已入库",value:2,style:"color: #76C458;font-size: 24rpx"},{label:"即将到期",value:3,style:"color: #FF4848;font-size: 24rpx"},{label:"延期未补款",value:4,style:"color: #FF4848;font-size: 24rpx"},{label:"已取出",value:5,style:"font-size: 24rpx"},{label:"延期已补款",value:7}]}},computed:{daysRemainingStyle:function(){switch(this.info.artworkStatus){case 1:case 2:case 3:case 5:return"color: #939393;font-size: 24rpx;";case 4:return"color: #FF4848;font-size: 24rpx;"}}},mounted:function(){var t=this;this.$mp.query.ID&&(this.ID=this.$mp.query.ID),this.getData(),e.createSelectorQuery().select(".title-block").boundingClientRect((function(n){var r=e.getSystemInfoSync(),o=r.windowHeight-n.bottom;t.distance=o})).exec()},methods:{back:function(){e.navigateBack()},getData:function(){var t=this;return(0,a.default)(o.default.mark((function n(){var r;return o.default.wrap((function(n){while(1)switch(n.prev=n.next){case 0:return n.next=2,(0,c.postDataByParams)("/api/warehouse/detail",{ID:Number(t.ID)});case 2:r=n.sent,200===r.code?t.info=r.data:e.showToast({title:r.msg,icon:"none"}),console.log(r,"res");case 5:case"end":return n.stop()}}),n)})))()}}};t.default=u}).call(this,n(2)["default"])},294:function(e,t,n){"use strict";n.r(t);var r=n(295),o=n.n(r);for(var a in r)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(a);t["default"]=o.a},295:function(e,t,n){}},[[288,"common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/order-goods/order-details"],{288:function(e,t,n){"use strict";(function(e,t){var r=n(4);n(26);r(n(25));var o=r(n(289));e.__webpack_require_UNI_MP_PLUGIN__=n,t(o.default)}).call(this,n(1)["default"],n(2)["createPage"])},289:function(e,t,n){"use strict";n.r(t);var r=n(290),o=n(292);for(var a in o)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return o[e]}))}(a);n(294);var c,u=n(33),i=Object(u["default"])(o["default"],r["render"],r["staticRenderFns"],!1,null,"725951bc",null,!1,r["components"],c);i.options.__file="pages/order-goods/order-details.vue",t["default"]=i.exports},290:function(e,t,n){"use strict";n.r(t);var r=n(291);n.d(t,"render",(function(){return r["render"]})),n.d(t,"staticRenderFns",(function(){return r["staticRenderFns"]})),n.d(t,"recyclableRender",(function(){return r["recyclableRender"]})),n.d(t,"components",(function(){return r["components"]}))},291:function(e,t,n){"use strict";var r;n.r(t),n.d(t,"render",(function(){return o})),n.d(t,"staticRenderFns",(function(){return c})),n.d(t,"recyclableRender",(function(){return a})),n.d(t,"components",(function(){return r}));try{r={titleBlock:function(){return n.e("components/title-block/title-block").then(n.bind(null,430))}}}catch(u){if(-1===u.message.indexOf("Cannot find module")||-1===u.message.indexOf(".vue"))throw u;console.error(u.message),console.error("1. 排查组件名称拼写是否正确"),console.error("2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"),console.error("3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件")}var o=function(){var e=this,t=e.$createElement,n=(e._self._c,e.statusValue.find((function(t){return t.value===e.info.artworkStatus}))),r=e.statusValue.find((function(t){return t.value===e.info.artworkStatus})),o=1!==e.info.artworkStatus?e.info.startAt.replaceAll("-",".")||"":null,a=1!==e.info.artworkStatus?e.info.endAt.replaceAll("-",".")||"":null;e.$mp.data=Object.assign({},{$root:{g0:n,g1:r,g2:o,g3:a}})},a=!1,c=[];o._withStripped=!0},292:function(e,t,n){"use strict";n.r(t);var r=n(293),o=n.n(r);for(var a in r)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(a);t["default"]=o.a},293:function(e,t,n){"use strict";(function(e){var r=n(4);Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o=r(n(63)),a=r(n(65)),c=n(262),u={name:"order-details",data:function(){return{distance:"",ID:"",info:{},statusValue:[{label:"全部状态",value:0},{label:"待入库",value:1,style:"color: #FFBA00;font-size: 24rpx"},{label:"已入库",value:2,style:"color: #76C458;font-size: 24rpx"},{label:"即将到期",value:3,style:"color: #FF4848;font-size: 24rpx"},{label:"延期未补款",value:4,style:"color: #FF4848;font-size: 24rpx"},{label:"已取出",value:5,style:"font-size: 24rpx"},{label:"延期已补款",value:7}]}},computed:{daysRemainingStyle:function(){switch(this.info.artworkStatus){case 1:case 2:case 3:case 5:return"color: #939393;font-size: 24rpx;";case 4:return"color: #FF4848;font-size: 24rpx;"}}},mounted:function(){var t=this;this.$mp.query.ID&&(this.ID=this.$mp.query.ID),this.getData(),e.createSelectorQuery().select(".title-block").boundingClientRect((function(n){var r=e.getSystemInfoSync(),o=r.windowHeight-n.bottom;t.distance=o})).exec()},methods:{back:function(){e.navigateBack()},getData:function(){var t=this;return(0,a.default)(o.default.mark((function n(){var r;return o.default.wrap((function(n){while(1)switch(n.prev=n.next){case 0:return n.next=2,(0,c.postDataByParams)("/api/warehouse/detail",{ID:Number(t.ID)});case 2:r=n.sent,200===r.code?t.info=r.data:e.showToast({title:r.msg,icon:"none"}),console.log(r,"res");case 5:case"end":return n.stop()}}),n)})))()}}};t.default=u}).call(this,n(2)["default"])},294:function(e,t,n){"use strict";n.r(t);var r=n(295),o=n.n(r);for(var a in r)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(a);t["default"]=o.a},295:function(e,t,n){}},[[288,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/order-goods/order-details.js.map