refactor:文字修改

myPages/ServiceObjectManagement/index.vue

@@ -1,9 +1,6 @@
 <template>
   <view class="">
     <view class="service-object-wrap">
-      <view @click="gotoAddServiceObject()" class="add">
-        +<text class="name">添加服务对象</text>
-      </view>
 
       <view class="service-object-list" >
 
@@ -30,8 +27,12 @@
             </view>
           </view>
         </view>
+      </view>
 
+      <view @click="gotoAddServiceObject()" class="add">
+        +<text class="name">添加服务对象</text>
       </view>
+
     </view>
   </view>
 </template>

myPages/serviceObjectInfo/index.vue

@@ -10,10 +10,8 @@
                     </view>
                     <view @click="uploadImg1(1)" class="arrow-right">
                         <view class="head-img">
-                            <image v-if="userInfo.facePhotoUrl" :src="userInfo.facePhotoUrl" mode=""></image>
-                            <image v-else src="/static/me/u1796.png" mode=""></image>
+                            <image :src="userInfo.facePhotoUrl || '/static/me/u4.png'" mode=""></image>
                         </view>
-                        <!-- <u-icon name="arrow-right" color="#666" size="26"></u-icon> -->
                     </view>
                 </view>
             </view>
@@ -33,7 +31,7 @@
                     >
                         <u--input
                                 v-model="userInfo.nickName"
-                                placeholder=""
+                                placeholder="请输入昵称"
                                 border="bottom"
                                 maxlength="20"
                                 type="text"
@@ -49,7 +47,7 @@
                         <u--input
                                 maxlength="20"
                                 v-model="userInfo.blood"
-                                placeholder=""
+                                placeholder="请输入关系"
                                 border="bottom"
                                 type="text"
                         ></u--input>
@@ -64,7 +62,7 @@
                         <u--input
                                 maxlength="20"
                                 v-model="userInfo.remark"
-                                placeholder=""
+                                placeholder="请输入备注"
                                 border="bottom"
                                 type="text"
                         ></u--input>
@@ -95,30 +93,47 @@
                 },
                 genderShow: false,
                 value1: '2023-12-12',
-                imgUrl1: ''
+                imgUrl1: '',
+                rules:[]
             };
         },
         mounted() {
         },
+        onShow(){
+            if (this.userInfo.facePhoto){
+                this.getImgUrlByOssId(this.userInfo.facePhoto)
+            }
+        },
         onLoad(option) {
 
             console.log('++++++++++++++++option+++++++++++++++',option)
-
             if(option.data){
-                const data = JSON.parse(option.data);
-                let url = data.facePhoto;
-                this.userInfo.facePhoto = url.startsWith("https") ? url :url.replace("http", "https");
-                this.userInfo = data;
+                this.userInfo = JSON.parse(option.data);
+                if (this.userInfo.facePhoto){
+                    this.getImgUrlByOssId(this.userInfo.facePhoto)
+                }
             }
-
-            // 用户信息
-            let user = uni.getStorageInfo('userInfo');
-
         },
         methods: {
 
+            getImgUrlByOssId(Id){
+                if (Id) {
+                    this.$api.getImage(Id).then(res=>{
+                        this.userInfo.facePhotoUrl = res.data.data[0].url.replace(/^http:/, "https:")
+                        this.$set(this.userInfo)
+                    });
+                }
+            },
+
             // 保存用户信息
             saveUserInfo(){
+
+                if(!this.userInfo.nickName){
+                    uni.showToast({
+                        title: "请填写昵称"
+                    })
+                    return;
+                }
                 if(!this.userInfo.blood){
                     uni.showToast({
                         title: "请填写关系"
@@ -176,7 +191,7 @@
                             },
                             success: (uploadFileRes) => {
                                 let res = JSON.parse(uploadFileRes.data)
-                                that.imgUrl1 = res.data.url;
+                                that.userInfo.facePhotoUrl = res.data.url.replace(/^http:/, "https:");
                                 that.userInfo.facePhoto = res.data.ossId
                             }
                         });
@@ -207,6 +222,7 @@
                 padding-bottom: 6px;
                 .nav-info{
                     display: flex;
+                    justify-content: space-between;
                     padding-left: 10px;
                     align-items: center;
                     .logo {
@@ -244,24 +260,19 @@
                     }
 
                     .arrow-right{
-                        width:64%;
-                        text-align: right;
-                        margin: 0 auto;
-                        cursor: pointer;
-                        padding-top: 3px;
+                        width: 50px;
+                        height: 50px;
                         display: flex;
                         justify-content: flex-end;
-                        align-items: center;
-                        image{
-                            width: 18px;
-                            height: 18px;
-                        }
+
                         .head-img {
-                            text-align: center;
-                            padding-right: 20px;
+                            width: 50px;
+                            height: 50px;
+                            border-radius: 25px;
                             image{
-                                width: 24px;
-                                height: 24px;
+                                width: 50px;
+                                height: 50px;
+                                border-radius: 25px;
                             }
                         }
                         .change-store{

myPages/setting/index.vue

@@ -31,7 +31,7 @@
 				<view @click="gotoSettingAccountPassword()" class="nav-info">
 					<view class="nav-desc">
 						<view class="nav-name">
-							<view class="">修改登录交易密码</view>
+							<view class="">密码</view>
 						</view>
 					</view>
 					<view class="arrow-right">

myPages/setting/setting-account-password.vue

@@ -56,7 +56,7 @@
 					</u-form-item>
 
 				  <u-form-item
-					label="新账号支付密码"
+					label="新密码"
 					prop="password"
 					labelWidth="auto"
 					labelAlign="right"

pages.json

@@ -28,7 +28,7 @@
 		{
 			"path": "pages/order/index",
 			"style": {
-				"navigationStyle": "custom",
+				"navigationBarTitleText": "我的订单",
 				"enablePullDownRefresh": false
 			}
 		},
@@ -153,7 +153,7 @@
 				{
 					"path": "storeService/index",
 					"style": {
-						"navigationBarTitleText": "到店服务",
+						"navigationBarTitleText": "当日排队",
 						"enablePullDownRefresh": false
 					}
 				},
@@ -167,7 +167,7 @@
 				{
 					"path": "bookService/index",
 					"style": {
-						"navigationBarTitleText": "预约服务",
+						"navigationBarTitleText": "预约排队",
 						"enablePullDownRefresh": false
 					}
 				},	{
@@ -192,7 +192,7 @@
 				{
 					"path": "setting/setting-account-password",
 					"style": {
-						"navigationBarTitleText": "设置交易密码",
+						"navigationBarTitleText": "设置密码",
 						"enablePullDownRefresh": false
 					}
 

pages/my/index.vue

@@ -112,7 +112,7 @@ export default {
 			group1:[
 				// {thumb:'/static/me/u1796.png',title:'贡献奖励记录',rightText:'',to:''},
 				{thumb:'/static/me/u1803.png',title:'实名认证',rightText:'',to:'/myPages/realNameAuth/index'},
-				// {thumb:'/static/me/u1812.png',title:'服务对象管理',rightText:'',to:'/myPages/ServiceObjectManagement/index'},
+				{thumb:'/static/me/u1812.png',title:'服务对象管理',rightText:'',to:'/myPages/ServiceObjectManagement/index'},
         		{thumb:'/static/me/u3.png',title:'我的推广',rightText:'',to:'/myPages/promotionCenter/index'},
 				// {thumb:'/static/me/u1833.png',title:'新老系统切换',rightText:'',to:'/myPages/systemSwitch/index'},
 				{thumb:'/static/me/u826.png',title:'储值服务',rightText:'',to:'/myPages/recharge/index'}

pages/order/index.vue

@@ -2,16 +2,16 @@
 	<view class="content">
 
 		<u-sticky>
-			<view ref="hContentWrap" class="hContentWrap h-content-wrap">
-				<view class="tab-bar">
-					<view class="tab-item" :class="{ active: currentTab === 0 }" @click="changeTab(0)">
-						服务订单
-					</view>
-					<view class="tab-item" :class="{ active: currentTab === 1 }" @click="changeTab(1)">
-						产品订单
-					</view>
-				</view>
-			</view>
+<!--			<view ref="hContentWrap" class="hContentWrap h-content-wrap">-->
+<!--				<view class="tab-bar">-->
+<!--					<view class="tab-item" :class="{ active: currentTab === 0 }" @click="changeTab(0)">-->
+<!--						服务订单-->
+<!--					</view>-->
+<!--					<view class="tab-item" :class="{ active: currentTab === 1 }" @click="changeTab(1)">-->
+<!--						产品订单-->
+<!--					</view>-->
+<!--				</view>-->
+<!--			</view>-->
 			<View class=" tabs" v-if="currentTab === 0">
 				<u-tabs :list="tabList" :scrollable="false" lineWidth="30" lineColor="#FFE05C" :activeStyle="{
             					color: '#333333',