From 4000806bddabd4a99c0b98cf86ec75d1ca36cabd Mon Sep 17 00:00:00 2001
From: chen <2659004835@qq.com>
Date: Fri, 18 Mar 2022 19:01:31 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E3=80=81=E6=96=B0=E5=A2=9E=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E8=B4=A6=E6=88=B7=E9=A1=B5=E9=9D=A2=E3=80=81=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E6=88=91=E8=A6=81=E8=AF=84=E4=BB=B7=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 commons/flying-monkey.css                  |  34 ++++-
 components/evan-switch/evan-switch.vue     | 133 +++++++++++++++++++
 components/rate.vue                        | 143 +++++++++++++++++++++
 pagesB/i-want-evaluate/i-want-evaluate.vue |  55 ++++++--
 pagesB/my-account/my-account.vue           |  29 ++++-
 pagesB/set-up/set-up.vue                   | 118 ++++++++++++++++-
 static/rate/rate1_0.png                    | Bin 0 -> 1150 bytes
 static/rate/rate1_1.png                    | Bin 0 -> 1149 bytes
 8 files changed, 495 insertions(+), 17 deletions(-)
 create mode 100644 components/evan-switch/evan-switch.vue
 create mode 100644 components/rate.vue
 create mode 100644 static/rate/rate1_0.png
 create mode 100644 static/rate/rate1_1.png

diff --git a/commons/flying-monkey.css b/commons/flying-monkey.css
index e7a7d1b..11a96b3 100644
--- a/commons/flying-monkey.css
+++ b/commons/flying-monkey.css
@@ -279,5 +279,35 @@ uni-radio .uni-radio-input {border: 1rpx solid #444444;}
 	color: #FFFFFF;
 }
 /* 我要评价 */
-.evaluate-addimg {}
-	
\ No newline at end of file
+.evaluate-addimg {
+	position: relative;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+.evaluate-addimg::before,.evaluate-addimg::after{
+	content: '';
+	display: block;
+	width: 2rpx;
+	background-color: #959595;
+	height: 60rpx;
+}
+.evaluate-addimg::before{
+	transform: rotate(90deg);
+}
+/* 我的账户 */
+.account-active {
+	position: relative;
+	color: #03affb;
+}
+.account-active::after{
+	position: absolute;
+	left: 50%;
+	transform: translateX(-50%);
+	bottom: 0;
+	content: '';
+	display: block;
+	width: 60%;
+	height: 4rpx;
+	background-color: #03affb;
+}
\ No newline at end of file
diff --git a/components/evan-switch/evan-switch.vue b/components/evan-switch/evan-switch.vue
new file mode 100644
index 0000000..2a2f4bc
--- /dev/null
+++ b/components/evan-switch/evan-switch.vue
@@ -0,0 +1,133 @@
+<template>
+	<view @click="toggle" class="evan-switch" :class="{'evan-switch--disabled':disabled}" :style="{width:2*size+'px',height:switchHeight,borderRadius:size+'px',backgroundColor:currentValue===activeValue?activeColor:inactiveColor}">
+		<view class="evan-switch__circle" :style="{width:size+'px',height:size+'px',transform:currentValue===activeValue?`translateX(${size}px)`:`translateX(0)`}"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'EvanSwitch',
+		props: {
+			value: {
+				type: [String, Number, Boolean],
+				default: false
+			},
+			activeColor: {
+				type: String,
+				default: '#108ee9'
+			},
+			inactiveColor: {
+				type: String,
+				default: '#fff'
+			},
+			size: {
+				type: Number,
+				default: 30
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			activeValue: {
+				type: [String, Number, Boolean],
+				default: true
+			},
+			inactiveValue: {
+				type: [String, Number, Boolean],
+				default: false
+			},
+			beforeChange: {
+				type: Function,
+				default: null
+			},
+			extraData: null,
+			contextLevel: {
+				type: Number,
+				default: 1
+			}
+		},
+		computed: {
+			switchHeight() {
+				// #ifdef APP-NVUE
+				return this.size + 2 + 'px'
+				// #endif
+				// #ifndef APP-NVUE
+				return this.size + 'px'
+				// #endif
+			}
+		},
+		watch: {
+			value: {
+				immediate: true,
+				handler(value) {
+					this.currentValue = value
+				}
+			}
+		},
+		data() {
+			return {
+				currentValue: false
+			}
+		},
+		methods: {
+			toggle() {
+				if (!this.disabled) {
+					if (this.beforeChange && typeof this.beforeChange === 'function') {
+						let context = this
+						for (let i = 0; i < this.contextLevel; i++) {
+							context = context.$options.parent
+						}
+						const result = this.beforeChange(this.currentValue === this.activeValue ? this.inactiveValue : this.activeValue,
+							this.extraData, context)
+						if (typeof result === 'object') {
+							result.then(() => {
+								this.toggleValue()
+							}).catch(() => {})
+						} else if (typeof result === 'boolean' && result) {
+							this.toggleValue()
+						}
+					} else {
+						this.toggleValue()
+					}
+				}
+			},
+			toggleValue() {
+				this.currentValue = this.currentValue === this.activeValue ? this.inactiveValue : this.activeValue
+				this.$emit('input', this.currentValue)
+				this.$emit('change', this.currentValue)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.evan-switch {
+		position: relative;
+		border-width: 1px;
+		border-color: rgba(0, 0, 0, 0.1);
+		border-style: solid;
+		transition: background-color 0.3s;
+		/* #ifndef APP-NVUE */
+		box-sizing: content-box;
+		/* #endif */
+	}
+
+	.evan-switch--disabled {
+		opacity: 0.3;
+	}
+
+	.evan-switch__circle {
+		position: absolute;
+		left: 0;
+		top: 0;
+		background-color: #fff;
+		border-radius: 50%;
+		/* #ifndef APP-NVUE */
+		box-shadow: 0 3px 1px 0 rgba(0, 0, 0, 0.05), 0 2px 2px 0 rgba(0, 0, 0, 0.1), 0 3px 3px 0 rgba(0, 0, 0, 0.05);
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		box-shadow: 1px 0 0px 0 rgba(0, 0, 0, 0.05);
+		/* #endif */
+		transition: transform 0.3s;
+	}
+</style>
diff --git a/components/rate.vue b/components/rate.vue
new file mode 100644
index 0000000..4a3c2f7
--- /dev/null
+++ b/components/rate.vue
@@ -0,0 +1,143 @@
+<template>
+    <view class="htz-rate-main">
+        <template v-for="(item,index) in count">
+            <image @tap="checkItem((index+1))" class="htz-rate-image" :key="index"
+                :style="{'width':size+'rpx','height':size+'rpx','padding-right':gutter+'rpx'}"
+                :src="checkedVal<(index+1)?defImgSrc:selImgSrc"></image>
+        </template>
+
+    </view>
+</template>
+
+<script>
+    export default {
+        name: 'htz-rate',
+        props: {
+			curentClick:{//多个评分时当前点击第几个
+				type:Number,
+				default:0
+			},
+            value: { //受控分值
+                type: Number,
+                default: 0,
+            },
+            count: { //数量
+                type: Number,
+                default: 5,
+            },
+            size: { //图标大小
+                type: Number,
+                default: 42,
+            },
+            gutter: { //图标间距
+                type: Number,
+                default: 15,
+            },
+            type: { //内置类型
+                type: Number,
+                default: 0,
+            },
+            disHref: { //自定义默认图片
+                type: String,
+                default: '',
+            },
+            checkedHref: { //自定义选中图片
+                type: String,
+                default: '',
+            },
+            readonly: { //是否只读
+                type: Boolean,
+                default: false,
+            },
+        },
+        data() {
+            return {
+                ImgData: ['/static/rate/rate1_0.png', '/static/rate/rate1_1.png'],
+                defImgSrc: '',
+                selImgSrc: '',
+                checkedVal: 0,
+            }
+        },
+        mounted: function() {
+            this.$nextTick(function() {
+                this.checkedVal = this.value;
+                if (this.disHref != '') {
+                    this.defImgSrc = this.disHref;
+                    this.selImgSrc = this.checkedHref;
+                } else {
+                    //if (this.type != undefined) {
+                    this.defImgSrc = this.ImgData[this.type];
+                    this.selImgSrc = this.ImgData[this.type].replace('_0', '_1');
+                    //}
+                }
+            });
+        },
+        watch: {
+            value(val, oldVal) {
+                this.checkedVal = this.value;
+            },
+        },
+        methods: {
+            checkItem(index) {
+                if (!this.readonly) {
+                    this.checkedVal = index;
+                    this.$emit('input', [index,this.curentClick]);
+                    this.$emit('change', [index,this.curentClick]);
+                }
+            },
+
+        }
+    }
+</script>
+
+<style>
+    .htz-rate-main {
+        display: inline-flex;
+    }
+
+    .htz-rate-image {
+        vertical-align: middle;
+    }
+
+
+    .htz-image-upload-list {
+        display: flex;
+        flex-wrap: wrap;
+    }
+
+    .htz-image-upload-Item {
+        width: 160rpx;
+        height: 160rpx;
+        margin: 13rpx;
+        border-radius: 10rpx;
+        position: relative;
+    }
+
+    .htz-image-upload-Item image {
+        width: 100%;
+        height: 100%;
+        border-radius: 10rpx;
+    }
+
+    .htz-image-upload-Item-add {
+        font-size: 105rpx;
+        /* line-height: 160rpx; */
+        text-align: center;
+        border: 1px dashed #d9d9d9;
+        color: #d9d9d9;
+    }
+
+    .htz-image-upload-Item-del {
+        background-color: #f5222d;
+        font-size: 24rpx;
+        position: absolute;
+        width: 35rpx;
+        height: 35rpx;
+        line-height: 35rpx;
+        text-align: center;
+        top: 0;
+        right: 0;
+        z-index: 100;
+        color: #fff;
+    }
+</style>
diff --git a/pagesB/i-want-evaluate/i-want-evaluate.vue b/pagesB/i-want-evaluate/i-want-evaluate.vue
index d4d3297..ed0c72e 100644
--- a/pagesB/i-want-evaluate/i-want-evaluate.vue
+++ b/pagesB/i-want-evaluate/i-want-evaluate.vue
@@ -4,41 +4,78 @@
 		<container-subgroup>
 			<view slot="content" style="margin: 0 -30rpx;">
 				<view class="bacf fon28 pad-sx30 pad-zy40">
-					<view class=" bold disjbac fw">
-						<view>长沙XXXXXXXXXXXX项目名称</view>
+					<view class=" bold disjbac fw line-h50">
+						<view class="mar-y20">长沙XXXXXXXXX项目名称</view>
 						<view>GD20220108-1002</view>
 					</view>
-					<view class="mar-sx20" style="color: #6b6a6a;">服务时间：2022-01-11 15 : 27</view>
+					<view class="mar-s10 mar-x30" style="color: #6b6a6a;">服务时间：2022-01-11 15 : 27</view>
 					<view class="radius20 pad30 dis" style="border: 2rpx solid #dcdcdc;">
 						<image src="/static/public/icon-evaluate-pen.png" mode="widthFix" lazy-load style="width: 25rpx;height: 30rpx;"></image>
-						<textarea class="fon24 mar-z20" style="height: 200rpx;" placeholder="写下您的服务体验，帮助我们更好的管理提升" placeholder-style="font-size:24rpx;color: #aaaaaa;" />
+						<textarea v-model="serviceExperience" class="fon24 mar-z20 width100" style="height: 200rpx;" placeholder="写下您的服务体验，帮助我们更好的管理提升" placeholder-style="font-size:24rpx;color: #aaaaaa;" />
 					</view>
 					<view class="fon30 bold mar-sx30">上传图片</view>
 					<view class="disac">
-						<view class="mar-y20" v-for="(item,index) in imgList" :key="index" style="background-color: #dcdcdc;">
+						<view @tap="chooseImg(index)" class="mar-y20" v-for="(item,index) in imgList" :key="index" style="background-color: #dcdcdc;">
 							<view v-if="item.imgsrc==''" class="evaluate-addimg" style="width: 142rpx;height: 142rpx;"></view>
-							<image v-else :src="item.imgsrc" mode="aspectFill" lazy-load style="width: 142rpx;height: 142rpx;"></image>
+							<image v-else :src="item.imgsrc" mode="aspectFill" lazy-load style="width: 142rpx;height: 142rpx;vertical-align: middle;"></image>
 						</view>
 					</view>
 				</view>
+				<view class="bacf fon28 pad-sx30 pad-zy40 mar-s20">
+					<view class="fon30 bold mar-sx30">您的评价</view>
+					<view class="mar-s40 mar-x50" style="color: #545454;">
+						<view class="mar-x40 disac"><text class="mar-y40">技术服务</text><rate :size="42" :gutter="40" :curentClick="0" v-model="rateNum" @change="chooseRate"></rate></view>
+						<view class="disac"><text class="mar-y40">客服态度</text><rate :size="42" :gutter="40" :curentClick="1" v-model="attitudeNum" @change="chooseRate"></rate></view>
+					</view>
+				</view>
+				<!-- 提交保存 -->
+				<view class="person-btn" style="margin-top: 50rpx;">提交保存</view>
 			</view>
 		</container-subgroup>
 	</view>
 </template>
 
 <script>
+	import rate from '@/components/rate.vue';
 	export default {
+	    components:{
+	        rate
+	    },
 		data() {
 			return {
-				imgList:[
+				imgList:[//上传图片数组
 					{imgsrc:''},
 					{imgsrc:''},
 					{imgsrc:''}
-				]
+				],
+				rateNum:5,//技术服务评分
+				attitudeNum:5,//客服态度评分
+				serviceExperience:''//服务体验
 			}
 		},
 		methods: {
-			
+			// 选择图片
+			chooseImg(index){
+				uni.chooseImage({
+					count:1,
+					sourceType:['album','camera'],
+					sizeType:['compressed'],
+					success: (res) => {
+						this.imgList[index].imgsrc = res.tempFilePaths[0];
+					}
+				})
+			},
+			chooseRate(arr){
+				switch (arr[1]){
+					case 0:
+					 this.rateNum = arr[0];
+						break;
+					case 1:
+					 this.attitudeNum = arr[0];
+						break;
+				}
+			   
+			},
 		}
 	}
 </script>
diff --git a/pagesB/my-account/my-account.vue b/pagesB/my-account/my-account.vue
index 8183fd0..7712596 100644
--- a/pagesB/my-account/my-account.vue
+++ b/pagesB/my-account/my-account.vue
@@ -1,6 +1,26 @@
 <template>
 	<view>
-		
+		<status-nav navBarTitle="我的账户" returnColor="#c2c2c2"></status-nav>
+		<container-subgroup>
+			<view slot="content" style="margin: 0 -30rpx;">
+				<view class="disja tcenter bbot fon32">
+					<view @tap="switchStatus(true)" class="width50 pad-x30" :class="current ? 'account-active' : ''">我的账户</view>
+					<view @tap="switchStatus(false)" class="width50 pad-x30" :class="!current ? 'account-active' : ''">未结算工单</view>
+				</view>
+				<view class="bacf pad-sx30 mar-s20 mar-zy20 radius10">
+					<view class="bbot mar-zy20 disjbac">
+						<view class="disjcac fc">
+							<view class="fon22 col9">账户总额(元)</view>
+							<view class="fon42 bold">￥266.00</view>
+						</view>
+						<view class="disjcac fc">
+							<view class="fon22 col9">联系客服?</view>
+							<view class="fon42 bold"></view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</container-subgroup>
 	</view>
 </template>
 
@@ -8,11 +28,14 @@
 	export default {
 		data() {
 			return {
-				
+				current:true
 			}
 		},
 		methods: {
-			
+			// 切换状态
+			switchStatus(status){
+				this.current = status;
+			}
 		}
 	}
 </script>
diff --git a/pagesB/set-up/set-up.vue b/pagesB/set-up/set-up.vue
index 8183fd0..a0c08b2 100644
--- a/pagesB/set-up/set-up.vue
+++ b/pagesB/set-up/set-up.vue
@@ -1,18 +1,130 @@
 <template>
 	<view>
-		
+		<status-nav navBarTitle="设置" returnColor="#c2c2c2"></status-nav>
+		<container-subgroup>
+			<view slot="content" style="margin: 0 -30rpx;" class="fon28">
+				<view class="bacf pad30 disjbac bbot">
+					<view>开启语音提醒</view>
+					<view><evan-switch v-model="voiceStatus" @change="voiceEv" :size="18" inactive-color="#b3b3b3" active-color="#fd8956"></evan-switch></view>
+				</view>
+				<view class="bacf pad30 disjbac">
+					<view>接受新消息通知</view>
+					<view><evan-switch v-model="newsStatus" @change="newsEv" :size="18" inactive-color="#b3b3b3" active-color="#fd8956"></evan-switch></view>
+				</view>
+				<view @tap="updatePassword" class="bacf pad30 disjbac mar-s20 bbot">
+					<view>修改登录密码</view>
+					<i class="icon icon-next col9" style="font-size: 26rpx;"></i>
+				</view>
+				<view @tap="cleanEv" class="bacf pad30 disjbac">
+					<view>清除缓存</view>
+					<view class="col9">{{cacheSize}} KB</view>
+				</view>
+				<view class="bacf pad30 disjbac mar-s20 bbot">
+					<view>上门服务条款</view>
+					<view class="disac col9">
+						V3.0<i class="icon icon-next col9 mar-z20" style="font-size: 26rpx;"></i>
+					</view>
+				</view>
+				<view class="bacf pad30 disjbac bbot">
+					<view>用户服务协议</view>
+					<view class="disac col9">
+						V1.1<i class="icon icon-next col9 mar-z20" style="font-size: 26rpx;"></i>
+					</view>
+				</view>
+				<view class="bacf pad30 disjbac bbot">
+					<view>飞猴云服务隐私政策</view>
+					<view class="disac col9">
+						V1.2<i class="icon icon-next col9 mar-z20" style="font-size: 26rpx;"></i>
+					</view>
+				</view>
+				<view class="bacf pad30 disjbac bbot">
+					<view>技术服务合作协议</view>
+					<view class="disac col9">
+						V1.1<i class="icon icon-next col9 mar-z20" style="font-size: 26rpx;"></i>
+					</view>
+				</view>
+				<view class="bacf pad30 disjbac bbot">
+					<view>关于飞猴云服务</view>
+					<view class="disac col9">
+						V1.1<i class="icon icon-next col9 mar-z20" style="font-size: 26rpx;"></i>
+					</view>
+				</view>
+				<view @tap="checkEdition" class="bacf pad30 disjbac">
+					<view>版本更新</view>
+					<view class="col9">当前版本 5.1.4</view>
+				</view>
+			</view>
+		</container-subgroup>
 	</view>
 </template>
 
 <script>
+	import evanSwitch from '@/components/evan-switch/evan-switch.vue';
 	export default {
+		components:{
+			evanSwitch
+		},
 		data() {
 			return {
-				
+				voiceStatus:false,//是否开启语音提醒
+				newsStatus:false,//是否开启接受新消息通知
+				cacheSize:'754.72',//缓存数据大小
 			}
 		},
+		onLoad() {
+			// 调用获取缓存数据的大小
+			this.getStorageDataNum();
+		},
 		methods: {
-			
+			// 获取缓存数据的大小
+			getStorageDataNum(){
+				// #ifdef APP-PLUS
+				var self = this;
+				plus.cache.calculate(function(size) { //size是多少个字节单位是b
+				    //做下面相应的处理
+				    if (size < 1024) {
+				        self.cacheSize = size + 'B';
+				    } else if (size / 1024 >= 1 && size / 1024 / 1024 < 1) {
+				        self.cacheSize = Math.floor(size / 1024 * 100) / 100 + 'KB';
+				    } else if (size / 1024 / 1024 >= 1) {
+				        self.cacheSize = Math.floor(size / 1024 / 1024 * 100) / 100 + 'M';
+				    }
+				});
+				// #endif
+			},
+			// 语音提醒事件
+			voiceEv(status){
+				console.log(status);
+			},
+			// 新消息通知事件
+			newsEv(status){
+				console.log(status);
+			},
+			// 修改登录密码
+			updatePassword(){
+				console.log('修改登录密码');
+			},
+			// 清除缓存事件
+			cleanEv(){
+				console.log('清除缓存事件');
+				// #ifdef APP-PLUS
+				var self = this;
+				//使用plus.cache.clear 清除应用中的缓存数据
+				plus.cache.clear(function() {
+					uni.showToast({
+						title: '清除成功!',
+						icon: 'none',
+						success() {
+							self.cacheSize = '0B'
+						}
+					})
+				});
+				// #endif
+			},
+			// 检测版本事件
+			checkEdition(){
+				console.log('检测版本事件');
+			}
 		}
 	}
 </script>
diff --git a/static/rate/rate1_0.png b/static/rate/rate1_0.png
new file mode 100644
index 0000000000000000000000000000000000000000..53a674ff66feb75fd2bc50fb06006544aebe2309
GIT binary patch
literal 1150
zcmeAS@N?(olHy`uVBq!ia0vp^>Oic*!3HF`%#~*|Ffe*&hD4M^`1)8S=jZArrsOB3
z>Q&?x0Oc7NZ0suv5|gu2OB9k)(=+pImEP~(ucVNfVyhHx>TBRz;GCL~=}}db8eHWU
zl3bOYY?-2DZ^va*VFffGH?<^Dp&~aYuh^=>Rtapb6_5=Q)>l#hD=EpgRdNJbs1V^B
zpx~Tel&WB=XQrEMXkw&bZmDNzW?*S#qN8ABU}&yyV6JaytZQIsWngAyY^eYRN_Jcd
zHbp6ERzWUqP|JWkTcwPWk^(Dz{qpj1y>er{{GxPyLrY6beFGzXBO_g)3f<z$ypqHU
z-MnIDkP#3wTvCgZi!uvJGV}8kKxQT;<(HP&Dk<rMEYXMB0`#6f+<!n0JcLs7fWcA(
z^#44Wg!c>#Oz%8h977^n&))FPhz%7v_VNDS%%r4+8e0uJBp!!dxweYAG{ib^<&PDU
zn>e_RPMmznk@e;2#tT+K)*2%0d?GCDd@PPjx)h?+yZYvw=-sHbXjxap6*aNP33I2Y
z*sh;bed$Rv_xCr~e{KGj_I7L8^6RfNJ=Z7jS5*kbUzs^2NbAk(ZB0khY&sb4^spOT
zdcP?5ply36>;3Z&*42sUGUpkWJ=nyWd;Osu&)3Zb(gp1WseZrna^9yutb1U!gSY?G
z_X|5Ls+oOxzc8D396rVW?{U&;>6Mx>;T5^li_Z5vR($x>&23hO?YHYDzYNOE3@@?d
zExi8fKy3eUsT&*Dsh#0yJ9<$5@V?YrH~W@<?6X*1pUk#7b+XmXucjK0t^|Cm*Z3W)
zm~?Fi$0p$&jM39L+4n!x{?m|OD0TnwbDko$|7riz3-e^n5~TCQqYWBcvUT~^{LNB+
zcRq9eVUvA_L)dIv`>prJy)U&<wAnVz<gTb(baujqmEG41(zbdQeW?>a{&A1RjBMBU
zN#|?kSSwzdcX{>kV#oZXe6N+;4LJ5Urhh#9%0O{WiNaEoqemTo<O(YEKkD=5D3#NH
zC{Z^v|IBX1d%}z#HQw!HNqAo1Qt|ftluLJN+?Ovoa8r%peXQe#%@vI5L0<K`Z*_M6
zuoo?VaZ;4&Hz#|64u8+9HBXB7+%gMYw!YA2Y016}hq+T$1}=(lo*vG-g4z5YlgB(a
z*Go|=w089F*l0TEsMNu0n;1h27K@3W&drLrvZr-b)9sX}58Mi}Z#G<Qkq(;}7=Be?
z@hf}HIif3n7_3{h@f$;)mUO_=o!MCqf1Blx?yWGNcgX#R@c+;=vG&09eT^m0=Zc8y
ztb^+x#pbO(!Fm3HbKukWhcpAXh&b|f8WrCx2=7)(U-^uClK9b?mM!*0$7&V44!M7b
zZ0vQs1B}Dw?)d&?g#j%M%7=oBPn8DQw7)%|?){7H2%oO>JMWFIMjeND2<xZcZ!J&i
pOWVA)tSfwFaO7{3ds?%;*xxE|`z><z@fA?9;pyt<vd$@?2>`yV=4t={

literal 0
HcmV?d00001

diff --git a/static/rate/rate1_1.png b/static/rate/rate1_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..9def1ba913247af0dc921481ff4bc8ec2b5d96bb
GIT binary patch
literal 1149
zcmeAS@N?(olHy`uVBq!ia0vp^>Oic*!3HF`%#~*|Ffe*&hD4M^`1)8S=jZArrsOB3
z>Q&?x0Oc7NZ0suv5|gu2OB9k)(=+pImEP~(ucVNfVyhHx>TBRz;GCL~=}}db8eHWU
zl3bOYY?-2DZ^va*VFffGH?<^Dp&~aYuh^=>Rtapb6_5=Q)>l#hD=EpgRdNJbs1V^B
zpx~Tel&WB=XQrEMXkw&bZmDNzW?*S#qN8ABU}&yyV6JaytZQIsWngAyY^eYRN_Jcd
zHbp6ERzWUqP|JWkTcwPWk^(Dz{qpj1y>er{{GxPyLrY6beFGzXBO_g)3f<z$ypqHU
z-MnIDkP#3wTvCgZi!uvJGV}8kKxQT;<(HP&Dk<rMEYXMB0`#6f+<!n0JcLs7fWcA(
z^#44Wg!c>#Om971977^n&)zuSJvCJ3_{Zye@3{-J1Rh^xQeq_j(8>7prMw+q>;qV`
zl>=9wI2D*B-Eu)~W2lzf4c5Ci(lW%i^%<$uCoY*C<C1u^r}+58T^9Eb7VbG;`)=>~
zxsvt;Gk)4V|6Ox__Vang`|cNOo#n3PanLSc+x^k@+r#&Hac5rj-r4tx;egSVjoNQw
z6Vp?f`I+)m`yO;|nBKB?RnCJ=1*UI~tlm5?zyJAGql2dptv%@Bcc0_hG|o7-Ji)lb
z+LnLylih!OU20Sy{lT&Eyra$i_Y8jzg)Xt&y7s_()je|mY*)wc@U7VHeZTzB{`9Zh
z-`h-<@4C3{!~4j)I$vjPY1ieg*8cY0;#}RIzWImbj>q14{Uu2C(sd!7zG<y<6FFWl
z;!U=V<JcX3_fY;0$pz+%|F(Mi9J#MHD{`-4U}oHn&plI$%+593Xjne=j?3;VwtqUM
ze<<H7{S$DwGBfn+)<tX!q~`UStre?V=T)4s@W7{#gV(hBlCv5U)3UjaueRvXU&8s*
zBE#vC<jO>z`49N)j%;FO`7J;HaYk5vkMH_phB8O%e?+Xh_$>PWgW#H(SEV1@%uzg6
z=<{o4{(0jYZzaCpFp=nAw%&8j5%)`Mmh!t=oh>F_l|DOD_O01X%^KyU)6XyAtz1{a
z?7pe$an9~@ex3j4g!ISG;nw=o)m)h%60Ukbv1EY<zlqex;;X(VLw<EkUwqV+@9u%M
zk_;a4h20OXJzm+kz-E=Ya^1SF2lEcUa=duv(yNa7tCe;n7PFg+d@TMNQNMGMSNYs`
zV!qy|ddoM&>?+k-CAgaF)L%bl{h%7j%agiVyDxn`ET$>?SLl2+>-+Vy{uJiF>vd4y
z(feuj<Y^)0vB!Q_2*y8*pEF_A>+egLeK#{dIVG_?eMjQU=b6h_UrMYjKCtDo=1cE=
zvj5(0acZx;&Y5?jdGjlu72B8S7e^i3Y5Z$H-+%MM)Uf}TK-vOhy8f?!+)$ET;<oB<
t*R#u8q8|QVTe821;rgQYllXT2wzFK)pF8{UMpIC!;pyt<vd$@?2>=w*0SN#A

literal 0
HcmV?d00001


From f9330094a1ca9f2fab07b39c7ec2dc8d80da7acb Mon Sep 17 00:00:00 2001
From: chen <2659004835@qq.com>
Date: Fri, 18 Mar 2022 19:07:28 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8DpayReturnVisit?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BApay-return-visit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                                    | 2 +-
 pages/workOrder/{payReturnVisit .vue => pay-return-visit.vue} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pages/workOrder/{payReturnVisit .vue => pay-return-visit.vue} (100%)

diff --git a/pages.json b/pages.json
index a2a8a58..8a5ad96 100644
--- a/pages.json
+++ b/pages.json
@@ -158,7 +158,7 @@
             
         }
         ,{
-            "path" : "pages/workOrder/payReturnVisit ",
+            "path" : "pages/workOrder/pay-return-visit",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "",
diff --git a/pages/workOrder/payReturnVisit .vue b/pages/workOrder/pay-return-visit.vue
similarity index 100%
rename from pages/workOrder/payReturnVisit .vue
rename to pages/workOrder/pay-return-visit.vue

From 4ea5a4223cf0eca24c997fe3689c922d75ea50b7 Mon Sep 17 00:00:00 2001
From: chen <2659004835@qq.com>
Date: Mon, 21 Mar 2022 14:53:40 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E8=B0=83=E7=94=A8=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=81=E6=B3=A8=E5=86=8C=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E3=80=81=E6=89=BE=E5=9B=9E=E5=AF=86=E7=A0=81=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E3=80=81=E7=9F=AD=E4=BF=A1=E9=AA=8C=E8=AF=81=E7=A0=81=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E3=80=81=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsFile/requst.js            | 14 +++---
 pages/forget/forget.vue     | 95 +++++++++++++++++++++----------------
 pages/login/login.vue       | 44 ++++++++++-------
 pages/register/register.vue | 24 +++++++---
 pages/tabbar/my/my.vue      | 17 ++++++-
 5 files changed, 122 insertions(+), 72 deletions(-)

diff --git a/jsFile/requst.js b/jsFile/requst.js
index 2fa353d..240f831 100644
--- a/jsFile/requst.js
+++ b/jsFile/requst.js
@@ -72,22 +72,20 @@ const request = (method, url, options) => {
             }
             break;
     }
+	let params = {};
+	if(options!=undefined) params = options;
+	params.token = uni.getStorageSync('token');
 	return new Promise((resolve, reject) => {
 		uni.request({
 			url: `${uni.getStorageSync('hostapi')}${url}`,
 			method: methods,
-			data: options,
+			data: params,
 			header: headers,
 			success: res => {
 				console.log(`${url}返的结果===>`,res);
 				if (res.statusCode == 200) {
-					if (res.data.code == 0) {
-						// 接口调用成功
-						resolve(res.data);
-					} else {
-						// 接口返回错误信息
-						checkError(res);
-					}
+					// 接口调用成功
+					resolve(res.data);
 				} else {
 					// 接口返回错误信息
 					checkError(res);
diff --git a/pages/forget/forget.vue b/pages/forget/forget.vue
index 7b4d203..9b28545 100644
--- a/pages/forget/forget.vue
+++ b/pages/forget/forget.vue
@@ -1,41 +1,46 @@
 <template>
 	<view class="pad-zy30">
-		<view class="fon52 bold mar-sx50">忘记密码？</view>
-		<view class="fon28">
-			<view class="forget-title mar-x10">手机号码</view>
-			<view class="forget-input-box posir">
-				<input @blur="inputBlurEv(0)" @focus="inputFocusEv(0)" @input="inputFocusEv(0)" class="fon24" type="number" maxlength="11" v-model="forget_phone" placeholder="请输入您的手机号码" placeholder-style="color:#c8c8c8;" />
-				<!-- 清除按钮 -->
-				<view class="clear-box" v-show="ifPhone" @tap="clearInput(0)"><view class="clear-close"><span></span><span></span></view></view>
+		<status-nav navBarTitle="找回密码" returnColor="#c2c2c2"></status-nav>
+		<container-subgroup>
+			<view slot="content" style="margin: 0 -30rpx;">
+				<view class="fon52 bold mar-sx50">忘记密码 ？</view>
+				<view class="fon28">
+					<view class="forget-title mar-x10">手机号码</view>
+					<view class="forget-input-box posir">
+						<input @blur="inputBlurEv(0)" @focus="inputFocusEv(0)" @input="inputFocusEv(0)" class="fon24" type="number" maxlength="11" v-model="forget_phone" placeholder="请输入您的手机号码" placeholder-style="color:#c8c8c8;" />
+						<!-- 清除按钮 -->
+						<view class="clear-box" v-show="ifPhone" @tap="clearInput(0)"><view class="clear-close"><span></span><span></span></view></view>
+					</view>
+					<view class="forget-title mar-x10">手机验证码</view>
+					<view class="forget-input-box posir">
+						<input @blur="inputBlurEv(1)" @focus="inputFocusEv(1)" @input="inputFocusEv(1)" class="fon24" type="number" maxlength="6" v-model="forget_code" placeholder="请输入手机验证码" placeholder-style="color:#c8c8c8;" />
+						<view class="forget-obtain-code" @tap="getCode">{{codeText}}</view>
+						<!-- 清除按钮 -->
+						<view class="clear-box" v-show="ifCode" @tap="clearInput(1)" style="right: 260rpx;"><view class="clear-close"><span></span><span></span></view></view>
+					</view>
+					<view class="forget-title mar-x10">新密码</view>
+					<view class="forget-input-box posir">
+						<input @blur="inputBlurEv(2)" @focus="inputFocusEv(2)" @input="inputFocusEv(2)" class="fon24" type="text" password v-model="forget_password" placeholder="请输入新密码" placeholder-style="color:#c8c8c8;" />
+						<!-- 清除按钮 -->
+						<view class="clear-box" v-show="ifPassword" @tap="clearInput(2)"><view class="clear-close"><span></span><span></span></view></view>
+					</view>
+					<view class="forget-title mar-x10">确认密码</view>
+					<view class="forget-input-box posir">
+						<input @blur="inputBlurEv(3)" @focus="inputFocusEv(3)" @input="inputFocusEv(3)" class="fon24" type="text" password v-model="forget_qpassword" placeholder="请再次确认密码" placeholder-style="color:#c8c8c8;" />
+						<!-- 清除按钮 -->
+						<view class="clear-box" v-show="ifqpassword" @tap="clearInput(3)"><view class="clear-close"><span></span><span></span></view></view>
+					</view>
+					<view class="forget-title mar-x10">单位名称</view>
+					<view class="forget-input-box posir">
+						<input @blur="inputBlurEv(4)" @focus="inputFocusEv(4)" @input="inputFocusEv(4)" class="fon24" type="text" v-model="forget_unitname" placeholder="请输入单位名称" placeholder-style="color:#c8c8c8;" />
+						<!-- 清除按钮 -->
+						<view class="clear-box" v-show="ifUnitname" @tap="clearInput(4)"><view class="clear-close"><span></span><span></span></view></view>
+					</view>
+				</view>
+				<!-- 立即修改 -->
+				<view class="forget-btn" @tap="submitEv">立即修改</view>
 			</view>
-			<view class="forget-title mar-x10">手机验证码</view>
-			<view class="forget-input-box posir">
-				<input @blur="inputBlurEv(1)" @focus="inputFocusEv(1)" @input="inputFocusEv(1)" class="fon24" type="number" maxlength="6" v-model="forget_code" placeholder="请输入手机验证码" placeholder-style="color:#c8c8c8;" />
-				<view class="forget-obtain-code" @tap="getCode">{{codeText}}</view>
-				<!-- 清除按钮 -->
-				<view class="clear-box" v-show="ifCode" @tap="clearInput(1)" style="right: 260rpx;"><view class="clear-close"><span></span><span></span></view></view>
-			</view>
-			<view class="forget-title mar-x10">新密码</view>
-			<view class="forget-input-box posir">
-				<input @blur="inputBlurEv(2)" @focus="inputFocusEv(2)" @input="inputFocusEv(2)" class="fon24" type="text" password v-model="forget_password" placeholder="请输入新密码" placeholder-style="color:#c8c8c8;" />
-				<!-- 清除按钮 -->
-				<view class="clear-box" v-show="ifPassword" @tap="clearInput(2)"><view class="clear-close"><span></span><span></span></view></view>
-			</view>
-			<view class="forget-title mar-x10">确认密码</view>
-			<view class="forget-input-box posir">
-				<input @blur="inputBlurEv(3)" @focus="inputFocusEv(3)" @input="inputFocusEv(3)" class="fon24" type="text" password v-model="forget_qpassword" placeholder="请再次确认密码" placeholder-style="color:#c8c8c8;" />
-				<!-- 清除按钮 -->
-				<view class="clear-box" v-show="ifqpassword" @tap="clearInput(3)"><view class="clear-close"><span></span><span></span></view></view>
-			</view>
-			<view class="forget-title mar-x10">单位名称</view>
-			<view class="forget-input-box posir">
-				<input @blur="inputBlurEv(4)" @focus="inputFocusEv(4)" @input="inputFocusEv(4)" class="fon24" type="text" v-model="forget_unitname" placeholder="请输入单位名称" placeholder-style="color:#c8c8c8;" />
-				<!-- 清除按钮 -->
-				<view class="clear-box" v-show="ifUnitname" @tap="clearInput(4)"><view class="clear-close"><span></span><span></span></view></view>
-			</view>
-		</view>
-		<!-- 立即修改 -->
-		<view class="forget-btn" @tap="submitEv">立即修改</view>
+		</container-subgroup>
 	</view>
 </template>
 
@@ -54,7 +59,8 @@
 				ifUnitname:false,
 				forget_unitname:'',
 				codeText:'获取验证码' ,// 获取验证码按钮文字
-				flagCode:true // 允许点击获取验证码
+				flagCode:true ,// 允许点击获取验证码
+				countDown:null//验证码倒计时事件
 			}
 		},
 		methods: {
@@ -69,7 +75,12 @@
 						affiliation: this.forget_unitname ,//单位名称  
 					}
 					this.$requst.post('/universal/api.login/password_find',params).then(res=>{
-						this.$toolAll.tools.showToast('找回成功');
+						if(res.code==1) {
+							this.$toolAll.tools.showToast('找回成功');
+							setTimeout(()=>{uni.navigateBack({delta:1})},1000)
+						} else {
+							this.$toolAll.tools.showToast(res.msg);
+						}
 					})
 				}
 			},
@@ -82,12 +93,12 @@
 						this.flagCode = false;
 						let count = 60;
 						this.codeText = `${count}S重新获取`
-						let countDown = setInterval(()=>{
+						this.countDown = setInterval(()=>{
 							count--;
 							count < 10 ? this.codeText = `0${count}S重新获取` : this.codeText = `${count}S重新获取`;
 							if(count==0) {
 								this.codeText = `重新获取`;
-								clearInterval(countDown);
+								clearInterval(this.countDown);
 								this.flagCode = true;
 							}
 						},1000)
@@ -100,6 +111,10 @@
 			getMessage(phone){
 				this.$requst.post('/universal/api.login/send_sms',{phone}).then(res=>{
 					this.$toolAll.tools.showToast(res.msg);
+					if(res.code==0) {
+						clearInterval(this.countDown);
+						this.codeText = `获取验证码`
+					}
 				})
 			},
 			// 检测是否某个输入框为空
@@ -202,5 +217,5 @@
 </script>
 
 <style>
-
+page{background-color: #FFFFFF;}
 </style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 6718b5c..d280a64 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -82,22 +82,32 @@
 		methods: {
 			// 提交事件
 			submitEv(){
-				// if(this.checkEmpty()){
-				// 	let params = {
-				// 		login_type: this.login_type, // 登陆手机类型： mobile：手机登陆、account：账号密码登陆  
-				// 		phone: this.login_type == 'mobile' ? this.login_phone : '', // 手机号码，login_type 为 mobile 时必填  
-				// 		password: this.login_password, // 密码，login_type 为 account 时必填  
-				// 		sms_code: this.login_code, // 短信验证码，login_type 为 mobile 时必填  
-				// 		username: this.login_type == 'account' ? this.login_phone : '', //账号，login_type 为 account 时必填  
-				// 		affiliation: this.login_unitName // 单位名称  
-				// 	}
-				// 	this.$requst.post('/universal/api.login/login',params).then(res=>{
-				// 		this.$toolAll.tools.showToast('登录成功');
-				// 	})
-				// }
-				uni.reLaunch({
-					url:'/pages/tabbar/pagehome/pagehome'
-				})
+				if(this.checkEmpty()){
+					let params = {
+						login_type: this.login_type, // 登陆手机类型： mobile：手机登陆、account：账号密码登陆  
+						phone: this.login_type == 'mobile' ? this.login_phone : '', // 手机号码，login_type 为 mobile 时必填  
+						password: this.login_password, // 密码，login_type 为 account 时必填  
+						sms_code: this.login_code, // 短信验证码，login_type 为 mobile 时必填  
+						username: this.login_type == 'account' ? this.login_phone : '', //账号，login_type 为 account 时必填  
+						affiliation: this.login_unitName // 单位名称  
+					}
+					this.$requst.post('/universal/api.login/login',params).then(res=>{
+						console.log(res,95);
+						if(res.code==1) {
+							this.$toolAll.tools.showToast('登录成功');
+							// 缓存token和角色类型
+							uni.setStorageSync('token',res.data.token);
+							uni.setStorageSync('type_id',res.data.type_id);
+							setTimeout(()=>{
+								uni.reLaunch({
+									url:'/pages/tabbar/pagehome/pagehome'
+								})
+							},2000)
+						} else {
+							this.$toolAll.tools.showToast(res.msg);
+						}
+					})
+				}
 			},
 			// 获取验证码
 			getCode(){
@@ -126,7 +136,7 @@
 			getMessage(phone){
 				this.$requst.post('/universal/api.login/send_sms',{phone}).then(res=>{
 					this.$toolAll.tools.showToast(res.msg);
-					if(res.data.length==0) {
+					if(res.code==0) {
 						this.codeText = '获取验证码';
 						clearInterval(this.countDown);
 					}
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 3584d09..e5453bf 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -93,7 +93,8 @@
 				register_unitName:'', // 注册时的单位名称
 				ifAgreen:false ,// 注册时是否勾选协议与政策
 				codeText:'获取验证码' ,// 获取验证码按钮文字
-				flagCode:true // 允许点击获取验证码
+				flagCode:true ,// 允许点击获取验证码
+				countDown:null//验证码倒计时事件
 			}
 		},
 		methods: {
@@ -108,9 +109,15 @@
 						affiliation: this.register_unitName //单位名称  
 					}
 					this.$requst.post('/universal/api.login/register',params).then(res=>{
-						this.$toolAll.tools.showToast('注册成功');
-						// 调用前往登录页
-						this.goLogin();
+						if(res.code==1) {
+							this.$toolAll.tools.showToast('注册成功');
+							setTimeout(()=>{
+								// 调用前往登录页
+								this.goLogin();
+							},1000)
+						} else {
+							this.$toolAll.tools.showToast(res.msg);
+						}
 					})
 				}
 			},
@@ -123,12 +130,12 @@
 						this.flagCode = false;
 						let count = 60;
 						this.codeText = `${count}S重新获取`
-						let countDown = setInterval(()=>{
+						this.countDown = setInterval(()=>{
 							count--;
 							count < 10 ? this.codeText = `0${count}S重新获取` : this.codeText = `${count}S重新获取`;
 							if(count==0) {
 								this.codeText = `重新获取`;
-								clearInterval(countDown);
+								clearInterval(this.countDown);
 								this.flagCode = true;
 							}
 						},1000)
@@ -141,6 +148,11 @@
 			getMessage(phone){
 				this.$requst.post('/universal/api.login/send_sms',{phone}).then(res=>{
 					this.$toolAll.tools.showToast(res.msg);
+					if(res.code==0) {
+						clearInterval(this.countDown);
+						this.codeText = `获取验证码`
+						this.flagCode = true;
+					}
 				})
 			},
 			// 检测是否某个输入框为空
diff --git a/pages/tabbar/my/my.vue b/pages/tabbar/my/my.vue
index 7c90159..b216166 100644
--- a/pages/tabbar/my/my.vue
+++ b/pages/tabbar/my/my.vue
@@ -45,7 +45,7 @@
 					</view>
 				</view>
 				<!-- 退出登录 -->
-				<view class="my-exit-btn">退出登录</view>
+				<view class="my-exit-btn" @tap="logOutEv">退出登录</view>
 			</view>
 		</view>
 		<!-- 底部tab -->
@@ -103,6 +103,21 @@
 			this.$toolAll.tools.disableShareEv();
 		},
 		methods: {
+			// 退出登录
+			logOutEv(){
+				this.$requst.post('/universal/api.login/signout').then(res=>{
+					if(res.code==1) {
+						this.$toolAll.tools.showToast('退出成功');
+						// 清除所有缓存
+						uni.clearStorageSync();
+						setTimeout(()=>{
+							uni.reLaunch({
+								url:'/pages/login/login'
+							})
+						},1000)
+					}
+				})
+			},
 			checkInfo(){
 				this.$requst.post('/api/user/info').then(res=>{
 					// console.log('用户信息：',res);

From b105715ccc199f6ea16ec092398c2ab42c462190 Mon Sep 17 00:00:00 2001
From: chen <2659004835@qq.com>
Date: Mon, 21 Mar 2022 16:36:07 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E8=B0=83=E7=94=A8=E9=A3=9E=E7=8C=B4?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9C=8D=E5=8A=A1=E5=8D=8F=E8=AE=AE=E3=80=81?=
 =?UTF-8?q?=E9=A3=9E=E7=8C=B4=E9=9A=90=E7=A7=81=E6=94=BF=E7=AD=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/agreement.vue   | 26 ++++++++++++++++++++++----
 pages/register/register.vue |  4 +++-
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/pages/login/agreement.vue b/pages/login/agreement.vue
index a43d586..3b99326 100644
--- a/pages/login/agreement.vue
+++ b/pages/login/agreement.vue
@@ -1,6 +1,11 @@
 <template>
 	<view>
-		
+		<status-nav :navBarTitle="title" returnColor="#c2c2c2"></status-nav>
+		<container-subgroup>
+			<view slot="content" style="margin: 0 -30rpx;" class="bacf">
+				
+			</view>
+		</container-subgroup>
 	</view>
 </template>
 
@@ -8,11 +13,24 @@
 	export default {
 		data(){
 			return {
-				
+				title:'',//标题
+				richText:''//富文本详情
 			}
 		},
-		onLoad() {
-			
+		onLoad(options) {
+			options.type*1 ? this.title = '飞猴隐私政策' : this.title = '飞猴用户服务协议';
+			this.checkAgreement(options.type);
+		},
+		methods:{
+			checkAgreement(type){
+				console.log(type,26);
+				let url = type*1 ? '/universal/api.login/register_user_agreement' : '/universal/api.login/register_privacy_agreement';
+				this.$requst.post(url).then(res=>{
+					if(res.code==1) {
+						// this.richText = 
+					} else this.$toolAll.tools.showToast(res.msg);
+				})
+			}
 		}
 	}
 </script>
diff --git a/pages/register/register.vue b/pages/register/register.vue
index e5453bf..02c3d46 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -266,7 +266,9 @@
 			},
 			// 前往协议或政策
 			goXY(index){
-				console.log(index);
+				uni.navigateTo({
+					url:`/pages/login/agreement?type=${index}`
+				})
 			}
 		}
 	}

From 2c2ab9eeaa6c2db5d02292237760722b621432cd Mon Sep 17 00:00:00 2001
From: chen <2659004835@qq.com>
Date: Mon, 21 Mar 2022 18:20:14 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E8=B4=A6=E6=88=B7=E9=A1=B5=E9=9D=A2=E3=80=81=E6=9C=AA=E7=BB=93?=
 =?UTF-8?q?=E7=AE=97=E5=B7=A5=E5=8D=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                |   2 +-
 commons/flying-monkey.css              |  47 ++++++++++++++++
 manifest.json                          |  16 +++++-
 pages/login/login.vue                  |   4 +-
 pagesB/my-account/my-account.vue       |  74 ++++++++++++++++++++++---
 static/public/icon-account-address.png | Bin 0 -> 1641 bytes
 static/public/icon-account-time.png    | Bin 0 -> 1185 bytes
 7 files changed, 130 insertions(+), 13 deletions(-)
 create mode 100644 static/public/icon-account-address.png
 create mode 100644 static/public/icon-account-time.png

diff --git a/App.vue b/App.vue
index 3ce8634..92ac298 100644
--- a/App.vue
+++ b/App.vue
@@ -8,7 +8,7 @@
 		// 优先于show方法
 		onLaunch: function() {
 			// 配置全局域名
-			uni.setStorageSync('hostapi','http://maintain.7and5.cn'); 
+			uni.setStorageSync('hostapi','/web'); 
 			// 设置主色调
 			uni.setStorageSync('publicColor','#000000');
 		},
diff --git a/commons/flying-monkey.css b/commons/flying-monkey.css
index 11a96b3..1ed5c5c 100644
--- a/commons/flying-monkey.css
+++ b/commons/flying-monkey.css
@@ -310,4 +310,51 @@ uni-radio .uni-radio-input {border: 1rpx solid #444444;}
 	width: 60%;
 	height: 4rpx;
 	background-color: #03affb;
+}
+.account-btn {
+	border: 1rpx solid #00a2e9;
+	color: #00a2e9;
+	border-radius: 16rpx;
+	padding: 8rpx 10rpx;
+}
+.account-detailed {
+	position: relative;
+	display: flex;
+	align-items: center;
+	font-size: 29rpx;
+	font-weight: bold;
+	padding-left: 20rpx;
+}
+.account-detailed::before {
+	position: absolute;
+	left: 0;
+	top: 4rpx;
+	bottom: 4rpx;
+	content: '';
+	display: block;
+	width: 4rpx;
+	background-color: #03affb;
+}
+.account-detailed-item view:nth-child(1) {
+	width: 16%;
+}
+.account-detailed-item view:nth-child(2) {
+	width: 40%;
+	text-align: center;
+}
+.account-detailed-item view:nth-child(3) {
+	width: 16%;
+	text-align: center;
+}
+.account-detailed-item view:nth-child(4) {
+	width: 22%;
+	text-align: center;
+}
+.unsettled-btn {
+	font-size: 30rpx;
+	color: #03affb;
+	border: 1rpx solid #03affb;
+	border-radius: 6rpx;
+	padding: 6rpx 20rpx;
+	margin-top: 10rpx;
 }
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index e2a3eff..8e3e06c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -84,7 +84,21 @@
     "h5" : {
         "sdkConfigs" : {
             "maps" : {}
-        }
+        },
+		"devServer" : {
+			"https" : false,
+			"proxy": {  
+				"/web": {  
+					"target": "http://maintain.7and5.cn",
+					"changeOrigin": true,   
+					"secure": false,
+					"pathRewrite": {
+						"^/web": ""  
+					}
+				}  
+			}  
+		}
+
     },
     "mp-baidu" : {
         "appid" : "24346353"
diff --git a/pages/login/login.vue b/pages/login/login.vue
index d280a64..a9df0a5 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -92,7 +92,7 @@
 						affiliation: this.login_unitName // 单位名称  
 					}
 					this.$requst.post('/universal/api.login/login',params).then(res=>{
-						console.log(res,95);
+						this.login_unitName = 95
 						if(res.code==1) {
 							this.$toolAll.tools.showToast('登录成功');
 							// 缓存token和角色类型
@@ -103,7 +103,7 @@
 									url:'/pages/tabbar/pagehome/pagehome'
 								})
 							},2000)
-						} else {
+						} else { 
 							this.$toolAll.tools.showToast(res.msg);
 						}
 					})
diff --git a/pagesB/my-account/my-account.vue b/pagesB/my-account/my-account.vue
index 7712596..b5dc69f 100644
--- a/pagesB/my-account/my-account.vue
+++ b/pagesB/my-account/my-account.vue
@@ -7,15 +7,70 @@
 					<view @tap="switchStatus(true)" class="width50 pad-x30" :class="current ? 'account-active' : ''">我的账户</view>
 					<view @tap="switchStatus(false)" class="width50 pad-x30" :class="!current ? 'account-active' : ''">未结算工单</view>
 				</view>
-				<view class="bacf pad-sx30 mar-s20 mar-zy20 radius10">
-					<view class="bbot mar-zy20 disjbac">
-						<view class="disjcac fc">
-							<view class="fon22 col9">账户总额(元)</view>
-							<view class="fon42 bold">￥266.00</view>
+				<!-- 我的账户 -->
+				<view v-if="current">
+					<view class="bacf pad-sx30 mar-s20 mar-zy20 radius10" style="box-shadow: 0 5rpx 20rpx rgba(0,0,0,.2);">
+						<view class="bbot mar-zy20 disjbac pad-x30">
+							<view class="disjcac fc">
+								<view class="fon22 col9">账户总额(元)</view>
+								<view class="fon42 bold mar-s20">￥266.00</view>
+							</view>
+							<view class="disjcac fc">
+								<view class="fon22 col9">联系客服?</view>
+								<view class="fon26 mar-s10 account-btn">查看明细</view>
+							</view>
 						</view>
-						<view class="disjcac fc">
-							<view class="fon22 col9">联系客服?</view>
-							<view class="fon42 bold"></view>
+						<view class=" mar-zy20 disjbac pad-s30">
+							<view class="disjcac fc">
+								<view class="fon22 col9">工单费用(元)</view>
+								<view class="fon42 bold mar-s20">￥266.00</view>
+							</view>
+							<view style="width: 2rpx;height: 120rpx;background-color: #dddddd;margin-top: -10rpx;margin-bottom: -10rpx;"></view>
+							<view class="disjcac fc">
+								<view class="fon22 col9">技术佣金(元)</view>
+								<view class="fon42 bold mar-s20">￥266.00</view>
+							</view>
+						</view>
+					</view>
+					<!-- 收支明细 -->
+					<view class="pad-zy30">
+						<view class="account-detailed mar-s50 mar-x30">收支明细</view>
+						<view class="fon28 disjbac bold account-detailed-item" style="color: #222222;">
+							<view>金额</view>
+							<view>工单编号</view>
+							<view>方式</view>
+							<view>工单日期</view>
+						</view>
+						<view class="fon24 disjbac account-detailed-item mar-s20" v-for="(item,index) in 20" :key="index" style="color: #4c4c4c;">
+							<view class="clips1">-¥1088</view> 
+							<view class="clips1">GD20220112-1001</view>
+							<view>现金</view>
+							<view class="clips1">2019-7-24</view>
+						</view>
+					</view>
+				</view>
+				<!-- 未结算工单 -->
+				<view v-else class="mar-s20 pad-zy10">
+					<view class="bacf pad-sx20 pad-zy30 radius10 mar-x10" v-for="(item,index) in 10" :key="index">
+						<view class="fon28 disjbac">
+							<view class="col3">株洲市XXX项目名称</view>
+							<view class="col9">林小雨</view>
+						</view>
+						<view class="fon24 disjbac mar-sx10">
+							<view class="col9">工单编号：GD20220112-1001</view>
+							<view style="color: #00a2e9;">故障类型：模组故障</view>
+						</view>
+						<view class="fon24">
+							<view class="col9 disac width100"><image src="/static/public/icon-account-time.png" mode="scaleToFill" style="width: 23rpx;height: 23rpx;" lazy-load class="pad-y10 flexs"></image>2022-01-12  13:25:16</view>
+						</view>
+						<view class="fon26 disjbac mar-s10">
+							<view class="" style="color: #ff0000;">维保已完成</view>
+							<view class="fon36"><text style="font-size: 24rpx;">￥</text>260.0</view>
+						</view>
+						<view class="bbot" style="margin: 20rpx -30rpx;"></view>
+						<view class="fon24 col9 disac"><image src="/static/public/icon-account-address.png" mode="scaleToFill" style="width: 19rpx;height: 25rpx;" class="flexs mar-y10"></image>湖南省长沙市xx区1001栋6-12</view>
+						<view class="dis fe">
+							<view class="unsettled-btn">去结算</view>
 						</view>
 					</view>
 				</view>
@@ -28,7 +83,8 @@
 	export default {
 		data() {
 			return {
-				current:true
+				current:true,
+				detailedList:[]
 			}
 		},
 		methods: {
diff --git a/static/public/icon-account-address.png b/static/public/icon-account-address.png
new file mode 100644
index 0000000000000000000000000000000000000000..65d3ecac2f637dcf4fe2c9a1ba146a97e54dee97
GIT binary patch
literal 1641
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

literal 0
HcmV?d00001

diff --git a/static/public/icon-account-time.png b/static/public/icon-account-time.png
new file mode 100644
index 0000000000000000000000000000000000000000..62f35173b3220003df76b9f0fd6b40c1a4248fad
GIT binary patch
literal 1185
zcmeAS@N?(olHy`uVBq!ia0vp^;vmey1|%P7U0J}u!04SB5>XQ2>tmIipR1RclAn~S
zSCLx)lxJYDv9BmdOwLX%QAkQn&&;z`dcS+Wl0s&Rtx~wDuYqrYb81GWM^#a3aFt(3
za#eP+Wr~u$9hXgo70`g()RIJnirk#MVyg;UC9t_xKsHENUr7P1q$Jx`$q{6sLWFOC
zf^&XRs)DJWnQpS7iIIZ2rJkXgfu)g&j)IYap}D?+xxS&Xu7RPIfti)Dr2-Tv*>Ne@
z6s4qD1-ZCEEd%mwl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{
z^NN*0MnKGPNi9w;$}A|!%+FH*nVFcBUs__Tq@)kBL?3Dk(0lrD{{cDh5K7Gh21^mp
z|MO%L-ZL;T3wpXZhIn+&ow~7GE>z@b{qu9b#l9==j@A?_o2Jca*2FRUNCS%w%ViG1
zBrfj%jY}>bShaG|5s_$52Z4<fW^`ycbqEDX>}JuKwqS;vj!0su=;r%-s&&eqC2x9{
zC&tecd}i<SdDZVL^S5l;#N?padWJ<oX+!Of%vq0TS|(RJU+Q@)xq$VZr`Du*SEKB^
zI$lp&vDNQ0BUg07?~NT5>c+>nUVE={cT27CkJDz`CT`JJns@HZ@>$C)RbRTK&10*R
zExPNj_cB2<wX(MMuiM(Mj}9F=boXS+C1ItN{ITrorUk8Aw|1?q-pi*uckbjj{;X55
zn7@nh`=lk?Rn~6F{q1&pTe<a8rf<ytId6l6a&P~;vF)u<LExp^ljhCTdVj?x>$mUi
z=gN<Y)*C5lEIq@p-g6go4gZ9hH|B}Gu&~=0tDGcR!TCd1scBiJ9>ev9(+pd~a{R@a
zB~E1S7CbD-`%$yt?zf$1RC44enyA0rdrr0Ic=EBwA4`7A{_K0P`%PEegfAQgD;SP9
zzMk~&O>=sB`bOWirRuH0mvVRgbiTy<z-6MzroUeeR)+79E|fR7x9`ub3NPKEmbuYG
z$vB_)s!hk1_S{*^W{OEoxZlO$wf1W6ZNI8R=M<}z-gAF>zpvq~r{>f7L0+1RFJ`Q&
z(%*cKQ_%5zsx@;)^`e6x|M|;p_^9y7ZhiIcl(dwz#LrH%R>>z^65Ox#lHv9p_XBnh
zm~Y3IrfD3=VGO#YR8YOTiH~zl$}=tN-+vdL`I9<fcSbbpiUWzax3^!6=DPE8UhKtk
z-IoRv7;D&MrfgY1|L1?#^v9M7oI6Agh#n9uEZTA5;iT^l7NNPnTi)(B{`~obPuAMy
zS!<6sq;FR~apvXSi`)`-R1XWvP5k2IGDmNzK<o$pZRcH&NP4=L2k#VZKG)}V<n^}m
z-oGL*)o%Nxq~tcUlFfo)5C5NiuYJruZg?9$Ygwh8@%^b^QvW}+JAZ56q?xOiPT3sW
znBSQHqE0CK$~$&GMsLAD)wyTR%x^2aE!z=#`*?%6sx7<C$z|8wx48=%GMcG~n(^N_
feqia_s9)lX0_S_)zWIm`RI+%w`njxgN@xNAb3ps}

literal 0
HcmV?d00001