浏览代码

feat:bug修改

zhanghui 4 月之前
父节点
当前提交
b5517322f4

+ 1 - 1
components/lxiaoxiao-cropper/lxiaoxiao-cropper.vue

@@ -1,6 +1,6 @@
 <template name="cropper">
 <template name="cropper">
 	<view>
 	<view>
-		<image :src="imgSrc.imgSrc" class="my-avatar" mode="aspectFill" @click="fSelect" :style="imgStyle"></image>
+		<image :src="imgSrc.imgSrc" class="my-avatar" mode="aspectFill"  :style="imgStyle"></image>
 		<!-- 上传图片 -->
 		<!-- 上传图片 -->
 		<canvas canvas-id="avatar-canvas" id="avatar-canvas" class="my-canvas" :style="{top: styleTop, height: cvsStyleHeight}"
 		<canvas canvas-id="avatar-canvas" id="avatar-canvas" class="my-canvas" :style="{top: styleTop, height: cvsStyleHeight}"
 		 disable-scroll="false"></canvas>
 		 disable-scroll="false"></canvas>

+ 16 - 11
myPages/ServiceObjectManagement/index.vue

@@ -11,7 +11,7 @@
             <view class="content">
             <view class="content">
               <view class="title-price">
               <view class="title-price">
                 <view class="title">
                 <view class="title">
-                  <text>{{item.nickName || '未填写'}}{{ "(" + item.no + ")"  }}</text>
+                  <text>{{item.nickName || '未填写'}}</text>
                 </view>
                 </view>
                 <view @click="gotoUpdateServiceObject(item)" class="icon-btn">
                 <view @click="gotoUpdateServiceObject(item)" class="icon-btn">
                   <image src="/static/me/u2299.png" mode="aspectFit"></image>
                   <image src="/static/me/u2299.png" mode="aspectFit"></image>
@@ -108,16 +108,21 @@
       },
       },
       // 去修改服务对象
       // 去修改服务对象
       gotoUpdateServiceObject(item){
       gotoUpdateServiceObject(item){
-        if(item.wardship == '1'){ // 监护人
-          uni.navigateTo({
-            url: '/myPages/serviceObjectAllInfo/index?data=' + JSON.stringify(item),
-          })
-        } else { // 不是监护人
-          item.opType = '2';
-          uni.navigateTo({
-            url: '/myPages/serviceObjectInfo/index?data=' + JSON.stringify(item) ,
-          })
-        }
+
+        uni.navigateTo({
+          url: '/myPages/serviceObjectAllInfo/index?data=' + JSON.stringify(item),
+        })
+
+        // if(item.wardship == '1'){ // 监护人
+        //   uni.navigateTo({
+        //     url: '/myPages/serviceObjectAllInfo/index?data=' + JSON.stringify(item),
+        //   })
+        // } else { // 不是监护人
+        //   item.opType = '2';
+        //   uni.navigateTo({
+        //     url: '/myPages/serviceObjectInfo/index?data=' + JSON.stringify(item) ,
+        //   })
+        // }
 
 
 
 
 
 

+ 5 - 4
myPages/serviceObjectAllInfo/index.vue

@@ -214,7 +214,7 @@
 
 
     <!-- 性别选择 -->
     <!-- 性别选择 -->
     <u-picker :show="genderShow" keyName="gender" @confirm="sureChooseGender" :columns="genderList"></u-picker>
     <u-picker :show="genderShow" keyName="gender" @confirm="sureChooseGender" :columns="genderList"></u-picker>
-    <cropper selWidth="660rpx" selHeight="660rpx" ref="cropper" quality="0.5" @uploadImg="uploadCropImg"  @upload="facePhotoUrl"  avatarStyle="width:100vw;height:100vw;"/>
+      <cropper selWidth="660rpx" selHeight="660rpx" ref="cropper" quality="0.5" @uploadImg="uploadCropImg"  @upload="facePhotoUrl.facePhotoUrl" />
 
 
   </view>
   </view>
 </template>
 </template>
@@ -227,7 +227,6 @@ export default {
   },
   },
   data() {
   data() {
     return {
     return {
-      facePhotoUrl:'',
       accessToken: null,
       accessToken: null,
       isAuthUpdate: false,
       isAuthUpdate: false,
       serviceProjectList: [],
       serviceProjectList: [],
@@ -293,7 +292,9 @@ export default {
       this.userInfo.nickName = data.nickName;
       this.userInfo.nickName = data.nickName;
       this.userInfo.remark = data.remark;
       this.userInfo.remark = data.remark;
       this.userInfo.id = data.id;
       this.userInfo.id = data.id;
-      this.getServiceObjectPhotoRecord(this.userInfo.id)
+      if (this.userInfo.id){
+        this.getServiceObjectPhotoRecord(this.userInfo.id)
+      }
       console.log('+++++++JSON.parse(option.data)++++++', this.userInfo)
       console.log('+++++++JSON.parse(option.data)++++++', this.userInfo)
     }
     }
 
 
@@ -324,7 +325,7 @@ export default {
               }
               }
               res.data.url.replace("http", "https");
               res.data.url.replace("http", "https");
               this.verifyFace(res.data)
               this.verifyFace(res.data)
-              this.facePhotoUrl =  res.data.url.replace("http", "https");
+              this.userInfo.facePhotoUrl =  res.data.url.replace("http", "https");
             }
             }
           });
           });
         }
         }

+ 1 - 1
myPages/serviceObjectFaceAuth/index.vue

@@ -33,7 +33,7 @@
       <text :style="{'margin-left':'10rpx'}">请阅读并同意</text>
       <text :style="{'margin-left':'10rpx'}">请阅读并同意</text>
       <text :style="{'color':'red'}" @click="goTermsOfService">《服务对象协议》</text>
       <text :style="{'color':'red'}" @click="goTermsOfService">《服务对象协议》</text>
     </view>
     </view>
-    <cropper selWidth="660rpx" selHeight="660rpx" ref="cropper" quality="0.5" @uploadImg="uploadCropImg"  @upload="facePhotoUrl"  avatarStyle="width:100vw;height:100vw;"/>
+    <cropper selWidth="660rpx" selHeight="660rpx" ref="cropper" quality="0.5" @uploadImg="uploadCropImg"  @upload="facePhotoUrl" />
   </view>
   </view>
 </template>
 </template>
 
 

+ 1 - 1
orderPages/orderDetail/index.vue

@@ -538,7 +538,7 @@
             this.availableChild.payAmount =  (this.availableChild.servicePrice - item.discountsPrice).toFixed(2)
             this.availableChild.payAmount =  (this.availableChild.servicePrice - item.discountsPrice).toFixed(2)
           }else {
           }else {
             //折扣券
             //折扣券
-            this.availableChild.discountAmount = (this.availableChild.servicePrice * (item.discounts / 10).toFixed(2)).toFixed(2)
+            this.availableChild.discountAmount = (this.availableChild.servicePrice * (item.discount / 10).toFixed(2)).toFixed(2)
             this.availableChild.payAmount =  (this.availableChild.servicePrice - this.availableChild.discountAmount).toFixed(2)
             this.availableChild.payAmount =  (this.availableChild.servicePrice - this.availableChild.discountAmount).toFixed(2)
           }
           }
         }else if (suggestType == 2){
         }else if (suggestType == 2){