Merge branch 'master' into ls

ghsApp/src/pagesClient/member/addCustomer.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="app-content">
     <view style="text-align:center;color:red;font-weight:bold;padding:20upx 0 20upx 0;font-size:30upx;">
-      请填写客户真实手机号，否则引起数据错乱自行负责
+      请填写客户真实手机号，否则引起错乱自行负责
     </view>
     <form @submit="formSubmit">
       <view class="module-com">
         <tui-list-cell class="line-cell" :hover="false" >
-          <div class="tui-title">花店名称</div>
+          <div class="tui-title">花店1</div>
           <input v-model="form.name1" type="text" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="name1" placeholder="请输入名称" />
         </tui-list-cell>
         <tui-list-cell class="line-cell" :hover="false">
@@ -18,8 +18,7 @@
           <input v-model="form.confirmMobile1" type="number" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="confirmMobile1" placeholder="花店手机号" />
         </tui-list-cell>
       </view>
-      <view class="app-footer">
-        <!-- <view class="admin-button-com middle blue" style="margin-right:60upx;font-size:30upx;height:70upx;line-height:70upx;width:160upx;" @click="pageTo({url:'/admin/work/add'})">新增</view> -->
+      <view>
         <div class="btn-wrap">
           <button class="admin-button-com blue big" formType="submit">确认</button>
         </div>
@@ -126,10 +125,16 @@ export default {
         miniOpenId:currentMiniOpenId
       }).then(res => {
         if(res.code == 1){
-          this.$msg(res.msg)
-          setTimeout(() => {
-            uni.navigateBack();
-          }, 2000)
+          if(res.data.customId && res.data.customId>0){
+              this.$util.confirmModal({content:'客户已经存在',okText:'查看',cancelText:'取消'},() => {
+                this.$util.pageTo({url: "/pagesClient/member/detail?id="+res.data.customId,type:2})
+              })
+          }else{
+            this.$msg(res.msg)
+            setTimeout(() => {
+              uni.navigateBack();
+            }, 2000)
+          }
         }
       });
     }