From 614fbf28e5fcf417366ad415678333f0a50c636b Mon Sep 17 00:00:00 2001
From: corala <18339694416@163.com>
Date: Fri, 28 Oct 2022 13:39:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/http.api.js             |  2 +-
 src/pages.json                     | 30 +++++++++++++++-----------
 src/pages/my/contact_check.vue     |  3 ++-
 src/pages/my/house_application.vue |  2 +-
 src/pages/my/mywarReport.vue       |  5 ++---
 src/pages/my/networkquery.vue      |  3 ---
 src/pages/my/protocal.vue          | 24 +++++++++++++++++++++
 src/pages/my/repairlist.vue        |  2 +-
 src/pages/tabs/customer.vue        |  2 +-
 src/pages/tabs/index.vue           |  4 ----
 src/pages/tabs/login.vue           | 34 +++++++++++++++++++++---------
 src/pages/tabs/me.vue              | 31 ++++++++++++++++++++++-----
 12 files changed, 100 insertions(+), 42 deletions(-)
 create mode 100644 src/pages/my/protocal.vue

diff --git a/src/common/http.api.js b/src/common/http.api.js
index 98a7f73..4ea9549 100644
--- a/src/common/http.api.js
+++ b/src/common/http.api.js
@@ -80,7 +80,7 @@ let findRepairPersonTaskurl= '/appCleanRepair/findRepairPersonTask.do' //查询
 let confirmRepairTaskurl= '/appCleanRepair/confirmRepairTask.do' //维修人员确认当前已完成的维修
 let repairEquipmentDictionaryurl= '/appCleanRepair/repairEquipmentDictionary.do' //维修设备字典
 let dealurl= '/appContract/deal.do' //成交合同申请
-let examineurl= '/appContract/examine.do' //合同主管审核店长审批
+let examineurl= '/appHouseContract/examine.do' //合同主管审核店长审批
 let processurl= '/appContractProcess/process.do' //合同申请进度
 let contracturl= '/appContractModel/contract.do' //改价申请详情
 let oneVerificationContractInfourl= '/appHouseContract/oneVerificationContractInfo.do' //成交合同第一步验证如果只添加部分数据，则根据房间id查询用户信息
diff --git a/src/pages.json b/src/pages.json
index 05e6cb1..71acf3d 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -17,23 +17,23 @@
     },
     "pages": [
         {
-			"path": "pages/tabs/index",
-			"style": {
-                "navigationBarTitleText": "8090公寓",
-                "navigationBarTextStyle": "black"
-			}
-	},{
+	// 		"path": "pages/tabs/index",
+	// 		"style": {
+    //             "navigationBarTitleText": "8090公寓",
+    //             "navigationBarTextStyle": "black"
+	// 		}
+	// },{
         "path": "pages/tabs/login",
         "style": {
             "navigationBarTitleText": "登录",
 			"navigationStyle": "custom"
         }
-	// },{
-    //     "path": "pages/tabs/index",
-	// 		"style": {
-    //             "navigationBarTitleText": "8090公寓",
-    //             "navigationBarTextStyle": "black"
-	// 		}
+	},{
+        "path": "pages/tabs/index",
+        "style": {
+            "navigationBarTitleText": "8090公寓",
+            "navigationBarTextStyle": "black"
+        }
     }, {
         "path": "pages/tabs/customer",
         "style": {
@@ -94,6 +94,12 @@
                 "navigationBarTitleText": "我的战报",
                 "navigationBarTextStyle": "black"
             }
+        }, {
+            "path": "protocal",
+            "style": {
+                "navigationBarTitleText": "协议",
+                "navigationBarTextStyle": "black"
+            }
         }, {
             "path": "myapply",
             "style": {
diff --git a/src/pages/my/contact_check.vue b/src/pages/my/contact_check.vue
index e33fdbf..53c7e65 100644
--- a/src/pages/my/contact_check.vue
+++ b/src/pages/my/contact_check.vue
@@ -129,13 +129,14 @@
 			confirm(){
 				// 审核状态 0 未审核 1 已审核 2 拒绝
 				this.$u.api.examine({body:{contractId:this.contractId,status:this.pass==1?1:2}}).then((res)=>{
-					console.log(res)
+					// console.log(res)
 					if(res.ErrNo=='0000'){
 						this.$refs.uToast.show({
 							title: '操作成功',
 							icon: 'none',
 							type:'success'
 						})
+						this.getList();
 					}
 				})
 			}
diff --git a/src/pages/my/house_application.vue b/src/pages/my/house_application.vue
index b4dc816..c50c3ff 100644
--- a/src/pages/my/house_application.vue
+++ b/src/pages/my/house_application.vue
@@ -51,7 +51,7 @@
 			<view class="item">
 				<view class="label">装修配货支付总计</view>
 				<view class="input">
-					<u-input :clearable="false" type="text" input-align="right" v-model="form.totalPayment" placeholder="请输入装修配货支付总计"></u-input>
+					<u-input style="width: 320rpx" :clearable="false" type="text" input-align="right" v-model="form.totalPayment" placeholder="请输入装修配货支付总计"></u-input>
 				</view>
 			</view>
 			<view class="item">
diff --git a/src/pages/my/mywarReport.vue b/src/pages/my/mywarReport.vue
index 3f22ee3..a595f53 100644
--- a/src/pages/my/mywarReport.vue
+++ b/src/pages/my/mywarReport.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="container" style="background: url(../../static/warreport.png) no-repeat #F8F8F8;background-size: 750rpx 334rpx;" >
+	<view class="container" >
 		<view class="cont-box" v-for="(item,index) in listData" :key="index">
 			<view class="my-title">
 				<image class="cup" src="/static/cup.png" mode="" />
@@ -98,8 +98,7 @@
 .container{
 	width: 100%;
 	height: 100vh;
-	// background: url(../../static/warreport.png) no-repeat #F8F8F8;;
-	// background: url('https://static.quhouse.com/26c187820b534a47a60c46663d480547.png') no-repeat #F8F8F8;;
+	background: url(http://images.2weisou.com/202210271525442yADGNwV.png) no-repeat #F8F8F8;;
 	background-size: 750rpx 334rpx;
 	background-repeat: no-repeat;
 	padding-top: 150rpx;
diff --git a/src/pages/my/networkquery.vue b/src/pages/my/networkquery.vue
index 2aac0be..4c58d99 100644
--- a/src/pages/my/networkquery.vue
+++ b/src/pages/my/networkquery.vue
@@ -30,9 +30,6 @@
 			};
 		},
 		onLoad(options) {
-		},
-		onShow() {
-		
 		},
 		created() {
 			this.getList()
diff --git a/src/pages/my/protocal.vue b/src/pages/my/protocal.vue
new file mode 100644
index 0000000..8c6246c
--- /dev/null
+++ b/src/pages/my/protocal.vue
@@ -0,0 +1,24 @@
+<template>
+	<web-view :src="src"></web-view>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				src: ''
+			};
+		},
+		onLoad(options) {
+			this.src = options.src;
+		},
+		created() {
+		},
+	
+		methods: {
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/pages/my/repairlist.vue b/src/pages/my/repairlist.vue
index e1c955c..33a8d30 100644
--- a/src/pages/my/repairlist.vue
+++ b/src/pages/my/repairlist.vue
@@ -17,7 +17,7 @@
 		<view class="list-item" v-for="(item,index) in listData" :key="index">
 			<view class="top">
 				<view class="top-left">
-					<image class="icon" src="/static/kehu/person_gray.png" mode="" />{{item.name}}
+					<image class="icon" src="/static/kehu/person_gray.png" mode="" />{{item.personName}}
 				</view>
 				<view class="tel">{{item.tel}}</view>
 			</view>
diff --git a/src/pages/tabs/customer.vue b/src/pages/tabs/customer.vue
index 4fb771c..dc1cf0d 100644
--- a/src/pages/tabs/customer.vue
+++ b/src/pages/tabs/customer.vue
@@ -52,7 +52,7 @@
 				</view>
 			</view>
 		</u-popup>
-		<u-modal v-model="modalShow" content="您确认通过该审核？" :show-cancel-button="true" confirm-color="#FF6D25" title="确认操作" @confirm="modalConfirm" ref="uModal" :async-close="true"></u-modal>
+		<u-modal v-model="modalShow" content="您确认放弃该条数据吗？" :show-cancel-button="true" confirm-color="#FF6D25" title="确认操作" @confirm="modalConfirm" ref="uModal" :async-close="true"></u-modal>
 	</view>
 </template>
 <script>
diff --git a/src/pages/tabs/index.vue b/src/pages/tabs/index.vue
index 32e92f2..d7c24ed 100644
--- a/src/pages/tabs/index.vue
+++ b/src/pages/tabs/index.vue
@@ -104,12 +104,8 @@
 				current: 0,
 				current1: 0,
 			};
-		},
-		onLoad(options) {
-
 		},
 		created(){
-			
 		},
 		onShow() {
 			this.current = 0
diff --git a/src/pages/tabs/login.vue b/src/pages/tabs/login.vue
index 9edebfb..7dc459b 100644
--- a/src/pages/tabs/login.vue
+++ b/src/pages/tabs/login.vue
@@ -37,12 +37,8 @@
         />
       </view>
     </view>
-    <view class="tip"
-      >注册/登录即代表同意<view class="protocal"> 《隐私政策》</view>及<view
-        class="protocal"
-        >《服务》</view
-      ></view
-    >
+    <view class="tip">注册/登录即代表同意<view class="protocal" @click="topage(0)"> 《隐私政策》</view>及<view class="protocal" @click="topage(1)">《服务》</view>
+    </view>
     <view class="login-btn" @click="checkCode">登录</view>
   </view>
 </template>
@@ -56,9 +52,31 @@ export default {
       text: "获取验证码",
       timer: null,
       isfinished: true,
+      src1: 'http://www8090.2weisou.com/privacy.html',//隐私政策
+      src2: 'http://www8090.2weisou.com/service.html',//服务协议
     };
   },
+  onShow() {
+    let token = uni.getStorageSync('token');
+    if(token){
+      this.$u.vuex("vuex_token",token);
+      uni.switchTab({
+        url: '/pages/tabs/index'
+      })
+    }
+  },
   methods: {
+    topage(type){
+      if(type==0){
+        uni.navigateTo({
+          url: '/pages/my/protocal?src='+ this.src1
+        })
+      }else{
+        uni.navigateTo({
+          url: '/pages/my/protocal?src='+ this.src2
+        })
+      }
+    },
     getCode() {
       let that = this;
       if(!that.isfinished) return;
@@ -126,10 +144,6 @@ export default {
 				})
 			},
   },
-  // onShareAppMessage(){
-
-  // },
-
   onHide() {
     clearInterval(this.timer);
   },
diff --git a/src/pages/tabs/me.vue b/src/pages/tabs/me.vue
index e33b607..662ad5b 100644
--- a/src/pages/tabs/me.vue
+++ b/src/pages/tabs/me.vue
@@ -39,8 +39,8 @@
 					<image class="icon" src="/static/my/phone.png" mode="" />
 					客服电话
 				</view>
-				<view>
-					400-8113936<image class="arrow" src="/static/my/arrow.png" mode="" />
+				<view @click="toCall">
+					{{callNumber}}<image class="arrow" src="/static/my/arrow.png" mode="" />
 				</view>
 			</view>
 			<view class="menu-item" @click="topage('my/networkquery')">
@@ -68,8 +68,8 @@
 		</view>
 		<view class="logout" @click="logout">退出登录</view>
 		<view class="agreement">
-			<view>隐私政策</view>
-			<view>服务协议</view>
+			<view @click="toXieyi(0)">隐私政策</view>
+			<view @click="toXieyi(1)">服务协议</view>
 		</view>
 	</view>
 </template>
@@ -77,13 +77,34 @@
 	export default {
 		data() {
 			return {
-				userinfo: {}
+				userinfo: {},
+				callNumber: '400-8113936',
+				src1: 'http://www8090.2weisou.com/privacy.html',//隐私政策
+      	src2: 'http://www8090.2weisou.com/service.html',//服务协议
 			};
 		},
 		onLoad(options) {
 			this.userinfo = wx.getStorageSync('user')
 		},
 		methods: {
+			toCall(){
+				wx.makePhoneCall(
+					{
+						phoneNumber: this.callNumber
+					}
+				)
+			},
+			toXieyi(type){
+				if(type==0){
+					uni.navigateTo({
+						url: '/pages/my/protocal?src='+ this.src1
+					})
+				}else{
+					uni.navigateTo({
+						url: '/pages/my/protocal?src='+ this.src2
+					})
+				}
+			},
 			topage(type){
 				uni.navigateTo({
 					url: '/pages/' + type