feat：bug修改

myPages/ServiceObjectManagement/index.vue

@@ -11,7 +11,7 @@
             <view class="content">
               <view class="title-price">
                 <view class="title">
-                  <text>{{item.nickName || '未填写'}}</text>
+                  <text>{{item.nickName || '未填写'}}{{ "(" + item.no + ")"  }}</text>
                 </view>
                 <view @click="gotoUpdateServiceObject(item)" class="icon-btn">
                   <image src="/static/me/u2299.png" mode="aspectFit"></image>

myPages/familyCard/giveFamilyCard/giveFamilyCard.vue

@@ -6,22 +6,22 @@
             <!--          <u-text text="Vip." color="#000000" slot="prefix" margin="0 3px 0 0" type="tips"></u-text>-->
             <!--        </u-input>-->
             <!--      </u-form-item>-->
-            <u-form-item labelWidth="auto" label="亲友手机号" prop="memberPhone" borderBottom>
+            <u-form-item labelWidth="auto" label="亲属手机号" prop="memberPhone" borderBottom>
                 <view class="flex-row">
-                    <u-input v-model="form.memberPhone" type="number" placeholder="请输入亲友手机号" border="none"></u-input>
+                    <u-input v-model="form.memberPhone" type="number" placeholder="请输入亲属手机号" border="none"></u-input>
                     <view class="customStyle" @click="getMemberList">
                         <tex>查询</tex>
                     </view>
                 </view>
             </u-form-item>
 
-            <u-form-item v-if="isSelectRelation" labelWidth="auto" label="亲友关系" prop="relation" borderBottom @click="showRelation = true" ref="item1">
-                <u--input v-model="form.relation" disabled disabledColor="#ffffff" placeholder="请选择亲友关系" border="none"></u--input>
+            <u-form-item v-if="isSelectRelation" labelWidth="auto" label="亲属关系" prop="relation" borderBottom @click="showRelation = true" ref="item1">
+                <u--input v-model="form.relation" disabled disabledColor="#ffffff" placeholder="请选择亲属关系" border="none"></u--input>
                 <u-icon slot="right" name="arrow-right"></u-icon>
             </u-form-item>
 
-            <u-form-item v-else labelWidth="auto" label="亲友关系" prop="relation" borderBottom  ref="item2">
-                <u--input v-model="form.relation"  disabledColor="#ffffff" placeholder="请输入亲友关系" border="none"></u--input>
+            <u-form-item v-else labelWidth="auto" label="亲属关系" prop="relation" borderBottom  ref="item2">
+                <u--input v-model="form.relation"  disabledColor="#ffffff" placeholder="请输入亲属关系" border="none"></u--input>
             </u-form-item>
 
             <!--      <u-form-item labelWidth="auto"  label="每月消费上限" prop="amountCap">-->
@@ -40,7 +40,7 @@
         <uni-popup ref="popup" type="bottom" @change="popupChange">
             <view class="popup">
                 <view class="flex-row justify-center popupTitle">
-                    <text>选择亲友</text>
+                    <text>选择亲属</text>
                 </view>
                 <view class="popupContent">
                     <view class="flex-row popupItem" v-for="(item,index) in memberList" :key="index" @click="selectMember(item)">
@@ -61,7 +61,7 @@
         </uni-popup>
 
 
-        <u-action-sheet :show="showRelation" :actions="actions" title="请选择亲友关系" @close="showRelation = false" @select="relationSelect">
+        <u-action-sheet :show="showRelation" :actions="actions" title="请选择亲属关系" @close="showRelation = false" @select="relationSelect">
         </u-action-sheet>
     </view>
 </template>
@@ -112,7 +112,7 @@
                     'relation': {
                         type: 'string',
                         required: true,
-                        message: '请选择亲友关系',
+                        message: '请选择亲属关系',
                         trigger: ['blur', 'change']
                     },
                 }
@@ -194,7 +194,7 @@
             },
             relationSelect(e) {
                 if (e.name === '自定义'){
-                    this.rules.relation.message = '请输入亲友关系'
+                    this.rules.relation.message = '请输入亲属关系'
                     this.isSelectRelation = false
                 }else {
                     this.form.relation = e.name

orderPages/activityDetail/activityDetail.vue

@@ -31,7 +31,7 @@
               <text>活动门店：</text>
             </view>
             <view class="activityValue">
-              <text>{{ activity.partStoreName }}</text>
+              <text>{{ activity.partStoreName || '' }}</text>
             </view>
           </view>
           <view class="flex-row">
@@ -179,12 +179,12 @@
     <uni-popup ref="popup" type="bottom">
       <view class="addService">
         <view class="flex-row justify-around">
-          <view :class="[type == 1 ? 'confirmButton' : 'cancelButton']"  @click="clickPopupTitleBtn(1)">
-            <text>选择服务对象</text>
-          </view>
           <view :class="[type == 2 ? 'confirmButton' : 'cancelButton']"  @click="clickPopupTitleBtn(2)">
             <text>选择推荐门店</text>
           </view>
+          <view :class="[type == 1 ? 'confirmButton' : 'cancelButton']"  @click="clickPopupTitleBtn(1)">
+            <text>选择服务对象</text>
+          </view>
         </view>
 
         <scroll-view class="scrollY" scroll-y>
@@ -234,7 +234,7 @@ export default {
   },
   data() {
     return {
-      type:1,
+      type:2,
       storeList: [],
       selectServiceObjectIndex: -1,
       selectStoreIndex: -1,

orderPages/orderDetail/index.vue

@@ -524,6 +524,9 @@
 
       use(item,suggestType){
 
+        console.log(item)
+        console.log(suggestType)
+
         if (suggestType == 1){
           //使用优惠券
           this.availableChild.suggestEquityCard = null
@@ -531,7 +534,7 @@
           this.availableChild.suggestCoupon = item
           if (item.discountsType == 1){
             //满减优惠券
-            this.availableChild.discountAmount = item.discountsPrice.toFixed(2)
+            this.availableChild.discountAmount = item.discountsPrice
             this.availableChild.payAmount =  (this.availableChild.servicePrice - item.discountsPrice).toFixed(2)
           }else {
             //折扣券
@@ -544,14 +547,14 @@
           this.availableChild.suggestType = 2
           this.availableChild.suggestEquityCard = item
           this.availableChild.discountAmount = (this.availableChild.servicePrice - item.faceValue).toFixed(2)
-          this.availableChild.payAmount =  item.faceValue.toFixed(2)
+          this.availableChild.payAmount =  item.faceValue
         }else {
           //不使用优惠
           this.availableChild.suggestType =  0
           this.availableChild.suggestCoupon = null
           this.availableChild.suggestEquityCard = null
           this.availableChild.discountAmount = 0
-          this.availableChild.payAmount =  this.availableChild.servicePrice.toFixed(2)
+          this.availableChild.payAmount =  ( this.availableChild.servicePrice - 0 ).toFixed(2)
         }
         this.$set(this.order.child,this.availableIndex,this.availableChild)
         let payAmount = 0      //计算订单总支付金额