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

ghs/src/admin/home/member.vue

@@ -17,7 +17,7 @@
           @click="pageTo({
 					url: '/admin/member/detail',
 					query: {
-						shopId: item.shopId
+						id: item.id
 					}
 				})"
         >

ghs/src/admin/home/workbench.vue

@@ -480,6 +480,8 @@ export default {
     padding: 18px 0 18px 20px;
     border-bottom: 1px solid $borderColor;
     font-weight: 600;
+    font-size: 24px;
+    color:#333333;
   }
   .total-blo {
     @include disFlex(center, space-between);

ghs/src/admin/member/detail.vue

@@ -3,10 +3,65 @@
     <view class="app-round_bg"></view>
     <!-- 客户信息 -->
     <view class="module-com user-info">
-          <view>21212</view>
-           <view class="212">
-              2121212
+      <view class="user-info_top">
+          <view class="user-info_lf">
+              <AppAvatarModule class="avatar" :src="userInfo.avatar" :width="100"></AppAvatarModule>
+              <view class="dec-bx">
+                <view>
+                    {{userInfo.shopName}}
+                </view>
+                <view>
+                    No.{{userInfo.retailShopId}}
+                </view>
+              </view>
+          </view>
+          <view 
+            v-if="userInfo.isOpen === 0"
+            class="invite-bt">
+            邀请开店
+          </view>
+          <view 
+            v-else
+            class="already-shop">
+            <i class="iconfont iconweixinlaiyuan"></i>
+            已开店
+          </view>
+      </view>
+      <view class="user-info_data order-wrap">
+          <view class="total-blo">
+            <view
+              class="total-list"
+              v-for="(item, index) in orderData"
+              :key="index"
+              @click="pageTo(item)"
+            >
+              <view class="app-color-3">{{ item.name }}</view>
+              <view :class="['list-num',index===0?'color-blue':'']">{{ item.value }}</view>
+            </view>
+        </view>
+      </view>
+          <!-- iconfont iconweixinlaiyuan _i  -->
+    </view>
+    <view class="module-com user-address_bx">
+        <view class="address-tit">
+          门店地址
+        </view>
+        <view class="address-des_bx">
+           <view>
+              <view>
+                冯宝宝 15280215347
+              </view>
+              <view class="">
+                中国北京北京市朝阳区还好软件园
+              </view>
+           </view>
+           <view>
+             <view class="invite-bt white">
+               关联微信
+             </view>
+             <i class="iconfont icondianhua1"></i>
            </view>
+        </view>
     </view>
   </view>
 </template>
@@ -34,7 +89,39 @@ export default {
   props: {},
   data() {
     return {
-      data: {},
+      userInfo: {
+        avatar:''
+      },
+      // 订单总览
+      orderData: [
+        {
+          name: "欠款",
+          value: 0,
+          url: "/admin/home/order",
+          type: 4,
+          query: {
+     
+          }
+        },
+        {
+          name: "消费次数",
+          value: 0,
+          url: "/admin/home/order",
+          type: 4,
+          query: {
+           
+          }
+        },
+        {
+          name: "消费金额",
+          url: "/admin/home/order",
+          type: 4,
+          query: {
+          
+          },
+          value: 0
+        }
+      ],
     };
   },
   computed: {
@@ -52,15 +139,8 @@ export default {
       // getLevel();
     },
     _getUserDet() {
-      getUserDet({ shopId: this.option.shopId }).then(res => {
-        if (this.$util.isEmpty(res.data)) {
-          return false;
-        }
-        this.data = res.data;
-        this.fundsData[0].value = res.data.userAsset.growth;
-        this.fundsData[1].value = res.data.userAsset.balance;
-        this.fundsData[2].value = res.data.userAsset.totalBuyNum;
-        this.fundsData[3].value = res.data.userAsset.totalExpend;
+      getUserDet({ id: this.option.id }).then(res => {
+        this.userInfo = res.data;
       });
     },
     // operate ===========================
@@ -81,15 +161,141 @@ export default {
   margin: 0 30px 20px;
   padding: 20px;
   background-color: #fff;
-  box-shadow: 0px 6px 16px #ddd;
+  // box-shadow: 0px 6px 16px #ddd;
   border-radius: 10px;
   position: relative;
   z-index: 10;
 }
 // 用户信息
 .user-info {
-  padding: 40px 30px 50px;
+  padding: 60px 20px 60px;
   position: relative;
   top: 51px;
+  & .user-info_top {
+    position: relative;
+    display: flex;
+    align-items: center;
+    height: 100px;
+    & .user-info_lf {
+      position: relative;
+      padding-left: 10px;
+      flex: 1;
+       & .avatar {
+         position: absolute;
+         left: 10px;
+         top: 50%;
+         transform: translate(0,-50%);
+       }
+       & .dec-bx {
+         padding-left: 130px;
+         & > view:nth-child(1) {
+           color: #333333;
+           font-size: 36px;
+           margin-bottom: 3px;
+         }
+         & > view:nth-child(2) {
+           color: #666666;
+           font-size: 30px;
+         }
+       }
+    }
+    & .already-shop {
+      color: #09BB07;
+      font-size: 30px;
+      font-weight: 400;
+      & > .iconfont {
+        padding-right: 8px;
+        font-size: 32px;
+      }
+    }
+  }
+}
+.invite-bt {
+    color: #FFFFFF;
+    font-size: 26px;
+    font-weight: 400;
+    width: 140px;
+    height: 50px;
+    line-height: 50px;
+    background-color: #3385FF;
+    text-align: center;
+    border-radius: 25px;
+    border: 1px solid #DDDDDD;
+    &.white{
+     background-color: #FFFFFF;
+     color: #666666;
+    }
+  }
+// 总览
+.total-wrap,
+.order-wrap {
+  .total-tit {
+    padding: 18px 0 18px 20px;
+    border-bottom: 1px solid $borderColor;
+    font-weight: 600;
+    font-size: 24px;
+    color:#333333;
+  }
+  .total-blo {
+    @include disFlex(center, space-between);
+    flex-wrap: wrap;
+    padding: 30px 0 0px;
+    .total-list {
+      width: 33%;
+      text-align: center;
+      margin:20px 0px;
+      border-right: 1px solid $borderColor;
+      .list-num {
+        margin-top: 8px;
+        margin-bottom: 8px;
+        font-size: 36px;
+        font-weight: bold;
+        &.color-blue {
+          color: #3385FF;
+        }
+      }
+    }
+    .total-list:nth-child(3n) {
+      border-right: none;
+    }
+    .total-list:nth-child(n + 4) {
+      padding-bottom: 0;
+    }
+  }
+}
+.user-address_bx {
+  margin-top: 70px;
+  padding:20px 0;
+  & .address-tit {
+    color: #999999;
+    font-size: 24px;
+    font-weight: 600;
+    padding:10px 0 20px 20px;
+    border-bottom: 1px solid #EEEEEE;
+  }
+  & .address-des_bx {
+    display: flex;
+    padding: 20px 10px 30px 20px;
+    & > view:nth-child(1) {
+      flex: 1;
+      margin-top: 10px;
+      & > view:nth-child(1) {
+        color: #333333;
+        font-size: 28px;
+        font-weight: bold;
+      }
+      & > view:nth-child(2) {
+        color: #666666;
+        font-size: 28px;
+        font-weight: 400;
+        margin-top: 20px;
+      }
+    }
+    & > view:nth-child(2) {
+      display: flex;
+      align-items: center;
+      justify-content: flex-start;
+    }
+  }
 }
 </style>

ghs/src/mixins/globalMixins.js

@@ -25,7 +25,7 @@ export default {
 			uni.setStorageSync('account', option.account)
 		}
 		uni.setStorageSync('currentQuery', JSON.stringify(option))
-		console.log(isLogin())
+		
 		if (isLogin() == false) {
 			wxLoginFn()
 				.then(res => {

ghs/src/static/iconfont/iconfont.css

@@ -1,18 +1,11 @@
 @font-face {
-  // font-family: 'iconfont';  /* project id 1525256 */
-  // src: url('https://at.alicdn.com/t/font_1525256_wlfxtfn2lio.eot');
-  // src: url('https://at.alicdn.com/t/font_1525256_wlfxtfn2lio.eot?#iefix') format('embedded-opentype'),
-  // url('https://at.alicdn.com/t/font_1525256_wlfxtfn2lio.woff2') format('woff2'),
-  // url('https://at.alicdn.com/t/font_1525256_wlfxtfn2lio.woff') format('woff'),
-  // url('https://at.alicdn.com/t/font_1525256_wlfxtfn2lio.ttf') format('truetype'),
-  // url('https://at.alicdn.com/t/font_1525256_wlfxtfn2lio.svg#iconfont') format('svg');
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://at.alicdn.com/t/font_1525256_o1jlicqqmi.eot');
-  src: url('https://at.alicdn.com/t/font_1525256_o1jlicqqmi.eot?#iefix') format('embedded-opentype'),
-  url('https://at.alicdn.com/t/font_1525256_o1jlicqqmi.woff2') format('woff2'),
-  url('https://at.alicdn.com/t/font_1525256_o1jlicqqmi.woff') format('woff'),
-  url('https://at.alicdn.com/t/font_1525256_o1jlicqqmi.ttf') format('truetype'),
-  url('https://at.alicdn.com/t/font_1525256_o1jlicqqmi.svg#iconfont') format('svg');
+  src: url('//at.alicdn.com/t/font_1525256_cnc52nrefdt.eot');
+  src: url('//at.alicdn.com/t/font_1525256_cnc52nrefdt.eot?#iefix') format('embedded-opentype'),
+  url('//at.alicdn.com/t/font_1525256_cnc52nrefdt.woff2') format('woff2'),
+  url('//at.alicdn.com/t/font_1525256_cnc52nrefdt.woff') format('woff'),
+  url('//at.alicdn.com/t/font_1525256_cnc52nrefdt.ttf') format('truetype'),
+  url('//at.alicdn.com/t/font_1525256_cnc52nrefdt.svg#iconfont') format('svg');
 }
 .iconfont {
   font-family: "iconfont" !important;
@@ -22,6 +15,62 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.iconjian:before {
+  content: "\e7e3";
+}
+
+.iconzeng:before {
+  content: "\e7e4";
+}
+
+.iconqiehuan1:before {
+  content: "\e7e2";
+}
+
+.iconqishouyinying:before {
+  content: "\e7e1";
+}
+
+.iconxiayi:before {
+  content: "\e7de";
+}
+
+.iconshangyi:before {
+  content: "\e7e0";
+}
+
+.iconyiruku:before {
+  content: "\e7df";
+}
+
+.iconyikaidian:before {
+  content: "\e7d7";
+}
+
+.icondianhua1:before {
+  content: "\e7d9";
+}
+
+.iconshoukuanma1:before {
+  content: "\e7d8";
+}
+
+.icondaichuku:before {
+  content: "\e7da";
+}
+
+.iconyichuku:before {
+  content: "\e7db";
+}
+
+.iconyiquxiao:before {
+  content: "\e7dc";
+}
+
+.icondairuku:before {
+  content: "\e7dd";
+}
+
 .iconshoukuanma:before {
   content: "\e600";
 }