Merge branch 'master' of git.huaml.com:zhh/front-end

ghs/src/admin/home/member.vue

@@ -10,22 +10,6 @@
       @change="change"
       itemWidth="50%"
     />
-    <!-- list -->
-    <!-- <view style="padding:0 8px 10px 8px;" v-if="showMoreUser">
-
-      <span class="user_tag">恋人(867)</span>
-      <span class="user_tag">学生(50)</span>
-      <span class="user_tag">准婚(150)</span>
-      <span class="user_tag">同行(30)</span>
-      <span class="user_tag">常买散花(837)</span>
-      <span class="user_tag">企业客户(66)</span>
-      <span class="user_tag">生日送过(43)</span>
-      <span class="user_tag">酒店(28)</span>
-      <span class="user_tag">影楼(10)</span>
-      <span class="user_tag">开花艺课(42)</span>
-      <span class="user_tag">学员(711)</span>
-
-    </view> -->
     <block v-if="!$util.isEmpty(list.data)">
       <block v-for="(item,index) in list.data" :key="index">
         <tui-list-cell
@@ -133,7 +117,6 @@ export default {
     }
   },
   onLoad(option) {
-    // this.init()
   },
   methods: {
     init() {

ghs/src/admin/member/add.vue

@@ -132,7 +132,9 @@ export default {
 			}).then(res => {
 				this.$msg('添加成功！')
 				setTimeout(() => {
-					this.$util.pageTo(1)
+					uni.reLaunch({
+						url: '/admin/home/member'
+					});
 				}, 1000)
 			})
 		},

ghs/src/admin/member/detail.vue

@@ -9,26 +9,26 @@
             <div class="flex-center">
               <span class="app-size-32">{{ data.userName }}</span>
 
-<template v-if="data.member > 0">
+          <template v-if="data.member > 0">
               <app-vip-module
                 class="level-img"
                 :vipImg="`${constant.imgUrl}/retail/member/grade/${data.member}.png`"
               />
-</template>
-<template v-else>
-  <template v-if="data.mobile == ''">
+            </template>
+            <template v-else>
+              <template v-if="data.mobile == ''">
                   <app-vip-module
                     class="level-img"
                     :vipImg="`${constant.imgUrl}/retail/member/grade/customer.png`"
                   />
-  </template>
-  <template v-else>
+              </template>
+              <template v-else>
                   <app-vip-module
                     class="level-img" 
                     :vipImg="`${constant.imgUrl}/retail/member/grade/member.png`"
                   />
-  </template>
-</template>
+              </template>
+            </template>
             </div>
             <div class="app-color-3">{{ data.id }}</div>
           </div>
@@ -147,23 +147,19 @@
     >
       <template v-slot:content>
         <div class="app-modal-input-wrap">
-
-    <view style="padding:0 8px 10px 8px;">
-
-<span class="user_tag">恋人</span>
-<span class="user_tag">学生</span>
-<span class="user_tag">准婚</span>
-<span class="user_tag">同行</span>
-<span class="user_tag">常买散花</span>
-<span class="user_tag">企业客户</span>
-<span class="user_tag">生日送过</span>
-<span class="user_tag">酒店</span>
-<span class="user_tag">影楼</span>
-<span class="user_tag">开花艺课</span>
-<span class="user_tag">学员</span>
-
-    </view>
-          
+          <view style="padding:0 8px 10px 8px;">
+            <span class="user_tag">恋人</span>
+            <span class="user_tag">学生</span>
+            <span class="user_tag">准婚</span>
+            <span class="user_tag">同行</span>
+            <span class="user_tag">常买散花</span>
+            <span class="user_tag">企业客户</span>
+            <span class="user_tag">生日送过</span>
+            <span class="user_tag">酒店</span>
+            <span class="user_tag">影楼</span>
+            <span class="user_tag">开花艺课</span>
+            <span class="user_tag">学员</span>
+          </view>
         </div>
       </template>
     </modal-module>