Merge remote-tracking branch 'origin/master'

ghsApp/src/admin/staff/list.vue

@@ -8,12 +8,12 @@
 				<block v-if="!$util.isEmpty(list.data)">
 					<div class="list" v-for="(item, index) in list.data" :key="index">
 						<div>
-							<image :src="item.adminBaseInfo.avatarUrl" mode="aspectFit" style="width:100rpx;height:100rpx;"></image>
+							<image :src="item.avatar" mode="aspectFit" style="width:100rpx;height:100rpx;"></image>
 						</div>
 						<div class="list-det">
 							<div class="list-det-left">
 								<div>
-									<span class="staff-name">{{ item.adminBaseInfo.adminName }}</span>
+									<span class="staff-name">{{ item.adminName }}</span>
 									<span>{{ item.roleName }}</span>
 								</div>
 								<div class="flex-center">
@@ -205,13 +205,9 @@ export default {
 			this.roleModal = false
 		},
 		modifyModalFn(item) {
-			// this.$msg('即将开通...')
-			// return false
 		},
 		// 删除弹窗
 		delModalFn(item) {
-			// this.$msg('即将开通...')
-			// return false
 			this.delModalText = this.tabIndex == 0 ? '确定删除该员工吗？' : '确定删除该角色吗？'
 			this.operateData = item
 			this.delModal = true

mallApp/src/pages/callback/index.vue

@@ -24,10 +24,6 @@
             <span>￥</span>
             <span class="app-size-36 app-bold">{{ option.totalPrice }}</span>
           </div>
-          <div
-            class="surplus app-color-3"
-            v-if="!$util.isEmpty(shopUser)"
-          >余额￥{{ shopUser.userAsset.balance }}</div>
           <div class="order-num app-color-3">订单号: {{ option.orderSn }}</div>
         </block>
         <!-- 待支付 - 订单支付成功 -->

mallApp/src/pages/home/user.vue

@@ -35,7 +35,7 @@
                 </div>
               </div>
               <div class="user-level">
-                <div>成长值 {{ shopUser.userAsset.growth }}/{{ shopUser.userAsset.nextLevelGrowth }}</div>
+                <div>成长值 {{ shopUser.growth }}/{{ shopUser.userAsset.nextLevelGrowth }}</div>
               </div>
             </div>
             <div class="user-blo-right login-attr-wrap">
@@ -63,7 +63,7 @@
           <div class="my-surplus">{{ shopUser.userAsset.balance || 0.00 }}</div>
         </div>
         <div class="surplus-right">
-          <button class="button-com" v-if="subscribe == 0 || mobile == ''" @click="showPopup">申请会员</button>
+
           <button
             class="button-com red"
             @click="pageToFn({
@@ -107,15 +107,7 @@
         </tui-list-cell>
       </tui-list-view>
     </div>
-    <div class="list-content">
-      <tui-list-view class="tui-list-view">
-        <tui-list-cell class="tui-list" :last="true" @click="logoutFn()">
-          <div class="list-wrap">
-            <div class="list-label">退出登录</div>
-          </div>
-        </tui-list-cell>
-      </tui-list-view>
-    </div>
+
     <login-popup
       :show="popupShow"
       :info="wxInfo"

mallApp/src/pages/interest/level.vue

@@ -13,7 +13,7 @@
     <div class="rank-bottom-wrap">
       <div class="rank-text">
         <div>1、充值或消费1元得1成长值</div>
-        <div>2、会员权益享受折扣：</div>
+        <div>2、会员在本店享受以下折扣：</div>
       </div>
       <!-- level -->
       <div class="level-list-wrap">

mallApp/src/pages/pay/index.vue

@@ -23,9 +23,8 @@
         </div>
       </div>
       <!-- 查看更多 -->
-      <div class="view-more" :class="{'open' : tabIndex == 1}" @click="changeDelivery">
-        <div class="view-more-text">{{ tabIndex == 0 ? '帮我送' : '收起' }}</div>
-        <i class="iconfont iconjiantouxia"></i>
+      <div class="view-more">
+        <div class="view-more-text">以下选填</div>
       </div>
       <!-- 查看更多 -->
       <block v-if="tabIndex == 1">
@@ -133,7 +132,7 @@ export default {
       constant: this.$constant,
       inpFocus: false,
       // tab
-      tabIndex: 0,
+      tabIndex: 1,
       tabs: [
         {
           name: "直接付款"
@@ -500,10 +499,9 @@ export default {
     font-size: 28px;
     @include disFlex(center, center);
     background-color: #fff;
-    color: #3385ff;
+    color: #cccccc;
     .view-more-text {
-      z-index: 200;
-      margin-right: 14px;
+      margin-left: 0px;
     }
     i {
       font-size: 30px;