shish пре 11 месеци
родитељ
комит
ef8dfa22a8

+ 12 - 10
ghsApp/src/admin/home/member.vue

@@ -39,16 +39,18 @@
                     余额<span class="amount_num" style="color:#3385FF;">{{ Math.abs(item.remainDebtAmount) }}</span>
                   </span>
                 </span>
-              <block v-if="item.passStatus == 1">
-                <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 10000" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">没有下过单</text>
-                <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 7" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1周未下单</text>
-                <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 30" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1个月未下单</text>
-                <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 180" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超半年未下单</text>
-                <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 365" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1年未下单</text>
-              </block>
-              <block v-else>
-                <text style="font-size:28upx;margin-left:20upx;color:#3385FF;font-weight:bold;">待审核</text>
-              </block>
+
+                <block v-if="item.passStatus == 1">
+                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 10000" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">没有下过单</text>
+                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 7" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1周未下单</text>
+                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 30" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1个月未下单</text>
+                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 180" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超半年未下单</text>
+                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 365" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1年未下单</text>
+                </block>
+                <block v-else>
+                  <text style="font-size:28upx;margin-left:20upx;color:#3385FF;font-weight:bold;">待审核</text>
+                </block>
+
               </div>
             </div>
           </div>

+ 15 - 1
hdApp/src/admin/home/member.vue

@@ -33,7 +33,21 @@
                     </div>
                   </div>
                   <div class="user-meta">
-                    <div class="visit-time">{{item.visitTime.substr(5,11)}}</div>
+                    <div class="visit-time">
+                      {{item.visitTime.substr(5,11)}}
+
+                      <block v-if="item.passStatus == 1">
+                        <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 10000" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">没有下过单</text>
+                        <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 7" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1周未下单</text>
+                        <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 30" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1个月未下单</text>
+                        <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 180" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超半年未下单</text>
+                        <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 365" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1年未下单</text>
+                      </block>
+                      <block v-else>
+                        <text style="font-size:28upx;margin-left:20upx;color:#3385FF;font-weight:bold;">待审核</text>
+                      </block>
+
+                    </div>
                   </div>
                 </div>
               </div>

+ 1 - 1
hdPad/src/pages/home/components/customInfo.vue

@@ -40,7 +40,7 @@
 
         <view class="info-item">
           <text class="label">等级</text>
-          <text class="value">{{customInfo.level || ''}}</text>
+          <text class="value">{{customInfo.memberName}}</text>
         </view>
 
         <view class="info-item">

+ 14 - 4
hdPad/src/pages/home/components/customList.vue

@@ -51,15 +51,25 @@
                     <view class="customer-info">
                         <view class="customer-name">
                             <text class="name-text">{{ item.name }}</text>
-                            <text class="order-warning">超1周未下单</text>
                         </view>
                         <view class="customer-balance-level">
-                            <text class="balance">余额: {{ item.balance || 0 }}</text>
-                            <text class="level">{{ item.level || '普通用户' }}</text>
+
+                            <block v-if="item.passStatus == 1">
+                                <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 10000" class="balance">没有下过单</text>
+                                <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 7" class="balance">超1周未下单</text>
+                                <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 30" class="balance">超1个月未下单</text>
+                                <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 180" class="balance">超半年未下单</text>
+                                <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 365" class="balance">超1年未下单</text>
+                            </block>
+                            <block v-else>
+                                <text class="balance">待审核</text>
+                            </block>
+                            <text class="level">{{ item.memberName }}</text>
+
                         </view>
                         <view class="customer-details">
                             <text class="mobile">{{ item.mobile }}</text>
-                            <text class="date">{{item.addTime ? item.addTime.substr(5,11):''}}</text>
+                            <text class="date">{{item.visitTime ? item.visitTime.substr(5,11):''}}</text>
                         </view>
                     </view>
                 </view>