会员等级变化

mall/src/components/module/app-vip.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-vip-module">
     <img class="vip-img" :src="vipImgUrl" alt mode="widthFix" />
-    <div class="vip-text">{{ text }}</div>
+    <div class="vip-text"></div>
   </div>
 </template>
 

mall/src/pages/home/user.vue

@@ -9,14 +9,25 @@
                 <div class="user-name">{{ shopUser.userName }}</div>
                 <div class="user-level-img">
                   <block v-if="!$util.isEmpty(shopUser)">
-                    <appVipModule
-                      v-if="shopUser.member >= 0 && mobile != '' && subscribe == 1"
-                      class="level-img"
-                      :text="`VIP${shopUser.member}`"
-                      :vipImgUrl="`${constant.imgUrl}/retail/interest/vip.png`"
-                    />
-                    <appVipModule v-else-if="shopUser.member == 0" class="level-img" :text="`VIP`" />
-                    <div class="nomal-text" v-else>普通客户</div>
+                    <template v-if="mobile == '' || subscribe == 0">
+                      <div class="nomal-text">普通客户</div>
+                    </template>
+                    <template v-else>
+                      <template v-if="shopUser.member > 0">
+                        <appVipModule
+                          class="level-img"
+                          :vipImgUrl="`${constant.imgUrl}/retail/interest/${shopUser.member}.png`"
+                        />
+                      </template>
+                      <template v-else>
+                        <template v-if="mobile != '' && subscribe == 1">
+                          <appVipModule class="level-img" :vipImgUrl="`${constant.imgUrl}/retail/interest/member.png`" />
+                        </template>
+                        <template v-else>
+                          <div class="nomal-text">普通客户</div>
+                        </template>
+                      </template>
+                    </template>
                   </block>
                 </div>
               </div>
@@ -29,7 +40,6 @@
             </div>
           </div>
           <div class="user-wrap-bottom">
-            <!-- <div class="level-lint"></div> -->
             <div class="level-lint">
               <progress
                 :percent="percentNum"
@@ -51,7 +61,6 @@
         </div>
         <div class="surplus-right">
           <button class="button-com" v-if="subscribe == 0 || mobile == ''" @click="showPopup">申请会员</button>
-          <!--<button class="button-com" @click="pageToFn({url: '/pages/pay/index',query: {pageStatus: 'recharge'}})">充值</button>-->
           <button
             class="button-com red"
             @click="pageToFn({
@@ -187,10 +196,9 @@ export default {
   },
   methods: {
     init() {
-
       getShopUser().then(res => {
-        this.mobile = res.mobile
-        this.subscribe = parseInt(res.subscribe)
+        this.mobile = res.mobile;
+        this.subscribe = parseInt(res.subscribe);
         if (this.option.scan == 1) {
           //没有注册手机号或关注公众号的
           if (this.$util.isEmpty(res.mobile) || res.subscribe == 0) {

mall/src/pages/interest/level.vue

@@ -25,7 +25,7 @@
 				<div class="level-list-blo">
 					<div class="level-list" v-for="(item, index) in list" :key="index">
 						<div>
-							<appVipModule class="level-img" :vipImgUrl="`${constant.imgUrl}/retail/interest/vip.png`" :text="`VIP${item.level}`" />
+							<appVipModule class="level-img" :vipImgUrl="`${constant.imgUrl}/retail/interest/grade/${item.level}.png`" />
 						</div>
 						<div>{{ item.growth }}</div>
 						<div>{{ item.discount }}</div>

mall/src/pages/member/detail.vue

@@ -11,8 +11,7 @@
               <app-vip-module
                 class="level-img"
                 v-if="data.member >= 0"
-                :text="`VIP${data.userAsset.member}`"
-                :vipImgUrl="`${constant.imgUrl}/retail/interest/vip.png`"
+                :vipImgUrl="`${constant.imgUrl}/retail/interest/grade/${data.userAsset.member}.png`"
               />
             </div>
             <div class="app-color-3">{{ data.id }}</div>

shop/src/views/order/components/order-detail.vue

@@ -22,35 +22,21 @@
 					<div class="card-tit">基本信息</div>
 					<div class="card-body">
 						<el-table :data="data">
-							<el-table-column
-								property="orderSn"
-								label="订单编号"
-								width="280px"
-							></el-table-column>
+							<el-table-column property="orderSn" label="订单编号" width="280px"></el-table-column>
 							<el-table-column property="sendCost" label="运费"></el-table-column>
-							<el-table-column property="prePrice" label="原价"></el-table-column>
+							<el-table-column property="prePrice" label="合计"></el-table-column>
 							<el-table-column property="actPrice" label="实付款"></el-table-column>
-							<el-table-column
-								property="sourceType"
-								label="订单来源"
-							></el-table-column>
-							<el-table-column
-								property="totalRecharge"
-								label="订单类型"
-							></el-table-column>
+							<el-table-column property="sourceType" label="订单来源"></el-table-column>
+							<el-table-column property="totalRecharge" label="订单类型"></el-table-column>
 						</el-table>
 						<el-table :data="data">
-							<el-table-column
-								property="sendType"
-								label="配送方式"
-								width="280px"
-							></el-table-column>
+							<el-table-column property="sendType" label="配送方式" width="280px"></el-table-column>
 							<el-table-column property="payWay" label="支付方式"></el-table-column>
 							<el-table-column property="grade" label="获得成长值"></el-table-column>
 							<el-table-column property="bookName" label="下单客户"></el-table-column>
 							<el-table-column label="客户打分">
-								<template slot-scope="scope"
-									><el-rate v-model="scope.row.totalFlow" disabled> </el-rate>
+								<template slot-scope="scope">
+									<el-rate v-model="scope.row.grade" disabled></el-rate>
 								</template>
 							</el-table-column>
 							<el-table-column property="evaluate" label="客户评价"></el-table-column>
@@ -62,33 +48,17 @@
 					<div class="card-tit">收花人信息</div>
 					<div class="card-body">
 						<el-table :data="data">
-							<el-table-column
-								property="receiveUserName"
-								label="昵称"
-							></el-table-column>
-							<el-table-column
-								property="receiveMobile"
-								label="手机号"
-							></el-table-column>
+							<el-table-column property="receiveUserName" label="昵称"></el-table-column>
+							<el-table-column property="receiveMobile" label="手机号"></el-table-column>
 							<el-table-column property="deadline" label="收花时间">
 								<template slot-scope="scope">
 									<span>{{ scope.row.deadline | formatTime }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column
-								property="receiveFullAddress"
-								label="地址"
-								width="280px"
-							></el-table-column>
-							<el-table-column
-								property="print"
-								label="操作"
-								width="110px"
-							>
-							<el-button type="primary" icon="el-icon-printer"></el-button>
+							<el-table-column property="receiveFullAddress" label="地址" width="280px"></el-table-column>
+							<el-table-column property="print" label="操作" width="110px">
+								<el-button type="primary" icon="el-icon-printer"></el-button>
 							</el-table-column>
-
-
 						</el-table>
 					</div>
 				</div>
@@ -99,10 +69,7 @@
 						<el-table :data="data">
 							<el-table-column property="bookName" label="昵称"></el-table-column>
 							<el-table-column property="bookMobile" label="手机号"></el-table-column>
-							<el-table-column
-								property="reachDate"
-								label="期望送到时间"
-							></el-table-column>
+							<el-table-column property="reachDate" label="期望送到时间"></el-table-column>
 							<el-table-column property="cardInfo" label="祝福语"></el-table-column>
 						</el-table>
 					</div>
@@ -124,55 +91,12 @@
 							</el-table-column>
 							<el-table-column property="title" label="商品名称"></el-table-column>
 							<el-table-column property="goodsId" label="ID"></el-table-column>
-							<el-table-column
-								property="goodsStyleName"
-								label="属性"
-							></el-table-column>
+							<el-table-column property="goodsStyleName" label="属性"></el-table-column>
 							<el-table-column property="num" label="数量"></el-table-column>
-							<!-- <el-table-column property="unitPrice" label="库存"></el-table-column> -->
 							<el-table-column property="unitPrice" label="小计"></el-table-column>
 						</el-table>
 					</div>
 				</div>
-				<!-- 费用信息 -->
-				<div class="card-wrap">
-					<div class="card-tit">费用信息</div>
-					<div class="card-body">
-						<el-table :data="data">
-							<el-table-column label="商品合计">
-								<template slot-scope="scope">
-									<span class="app-price">{{
-										scope.row.prePrice - scope.row.sendCost
-									}}</span>
-								</template>
-							</el-table-column>
-							<el-table-column property="sendCost" label="运费"></el-table-column>
-							<el-table-column property="prePrice" label="应付款"></el-table-column>
-							<el-table-column
-								property="discountAmount"
-								label="随机优惠"
-							></el-table-column>
-						</el-table>
-						<el-table :data="data">
-							<el-table-column label="会员优惠">
-								<template slot-scope="scope">
-									<span>{{ scope.row.discountType == 1 ? '有' : '无' }}</span>
-								</template></el-table-column
-							>
-							<el-table-column property="modPrice" label="手动改价"></el-table-column>
-							<el-table-column property="balance" label="优惠券">
-								<template slot-scope="scope">
-									<span>{{ scope.row.discountType == 0 ? '有' : '无' }}</span>
-								</template>
-							</el-table-column>
-							<el-table-column label="实付款">
-								<template slot-scope="scope">
-									<span class="app-price">{{ scope.row.actPrice }}</span>
-								</template>
-							</el-table-column>
-						</el-table>
-					</div>
-				</div>
 			</div>
 		</el-drawer>
 	</div>
@@ -195,9 +119,7 @@ export default {
 	},
 	methods: {
 		init() {
-			console.log('蒋小姐额', this.orderOperate);
 			this.$service.order.info({ id: this.orderOperate.id }).then(res => {
-				console.log('江总', res);
 				this.data = [res];
 				this.showOrderDetail = true;
 			});
@@ -243,10 +165,7 @@ export default {
 	padding-bottom: 20px;
 }
 .card-wrap {
-	// padding: 0 20px;
 	margin: 20px;
-	// border: 1px solid $borderColor;
-	// border-bottom: 0;
 	.card-tit {
 		font-size: 16px;
 		margin-bottom: 8px;