Главная Обзор Помощь
Регистрация Вход
zhh
/
front-end
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

更改

fuwei 6 лет назад
Родитель
15a6c89bef d6776bf42c
Сommit
c40b98e489
32 измененных файлов с 616 добавлено и 568 удалено
Разделённый вид Показать статистику Diff
  1. 1 1
      mall/dist/build/h5/index.html
  2. 0 0
      mall/dist/build/h5/static/js/chunk-vendors.223f0a00.js
  3. 0 0
      mall/dist/build/h5/static/js/index.af1340b7.js
  4. 0 0
      mall/dist/build/h5/static/js/pages-goods-detail.0a9d2a70.js
  5. 0 0
      mall/dist/build/h5/static/js/pages-goods-detail.7efde1f7.js
  6. 0 0
      mall/dist/build/h5/static/js/pages-home-user.c2d6006e.js
  7. 0 0
      mall/dist/build/h5/static/js/pages-home-user.fd81e955.js
  8. 0 0
      mall/dist/build/h5/static/js/pages-interest-invite.50984fe4.js
  9. 0 0
      mall/dist/build/h5/static/js/pages-interest-invite.af4c8c8d.js
  10. 0 0
      mall/dist/build/h5/static/js/pages-interest-level.77a65b22.js
  11. 0 0
      mall/dist/build/h5/static/js/pages-interest-level.c9d9aa53.js
  12. 0 0
      mall/dist/build/h5/static/js/pages-order-buy.bdda131a.js
  13. 0 0
      mall/dist/build/h5/static/js/pages-order-buy.d3c3d6b2.js
  14. 0 0
      mall/dist/build/h5/static/js/pages-order-buy~pages-pay-index.42ffbbc2.js
  15. 0 0
      mall/dist/build/h5/static/js/pages-order-buy~pages-pay-index.ef7fbc45.js
  16. 0 0
      mall/dist/build/h5/static/js/pages-order-detail.3916dd01.js
  17. 0 0
      mall/dist/build/h5/static/js/pages-order-detail.c11b23db.js
  18. 0 0
      mall/dist/build/h5/static/js/pages-pay-index.106457d0.js
  19. 0 0
      mall/dist/build/h5/static/js/pages-pay-index.bb830b1b.js
  20. 0 0
      mall/dist/build/h5/static/js/qqmap-wx-jssdk.min.js
  21. 25 25
      mall/src/components/app-coupon-sel.vue
  22. 4 4
      mall/src/components/app-delivery.vue
  23. 1 1
      mall/src/components/app-swiper.vue
  24. 1 1
      mall/src/components/plugin/modal.vue
  25. 0 4
      mall/src/pages/home/index.vue
  26. 293 279
      mall/src/pages/interest/invite.vue
  27. 2 4
      mall/src/pages/interest/level.vue
  28. 44 15
      mall/src/pages/order/buy.vue
  29. 240 230
      store/src/admin/home/member.vue
  30. 1 1
      store/src/admin/official/pay.vue
  31. 3 3
      store/src/admin/order/detail.vue
  32. 1 0
      store/src/components/module/app-vip.vue

+ 1 - 1
mall/dist/build/h5/index.html
Просмотреть файл 

@@ -1,3 +1,3 @@
 
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>花卉宝</title><script>document.addEventListener('DOMContentLoaded', function() {
 
 				document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
 
-			})</script><link rel=stylesheet href=/static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/static/js/chunk-vendors.7afd6203.js></script><script src=/static/js/index.05e33697.js></script></body></html>
 
+			})</script><link rel=stylesheet href=/static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/static/js/chunk-vendors.223f0a00.js></script><script src=/static/js/index.af1340b7.js></script></body></html>

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
mall/dist/build/h5/static/js/chunk-vendors.223f0a00.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
mall/dist/build/h5/static/js/index.af1340b7.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
mall/dist/build/h5/static/js/pages-goods-detail.0a9d2a70.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
mall/dist/build/h5/static/js/pages-goods-detail.7efde1f7.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
mall/dist/build/h5/static/js/pages-home-user.c2d6006e.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
mall/dist/build/h5/static/js/pages-home-user.fd81e955.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
mall/dist/build/h5/static/js/pages-interest-invite.50984fe4.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
mall/dist/build/h5/static/js/pages-interest-invite.af4c8c8d.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
mall/dist/build/h5/static/js/pages-interest-level.77a65b22.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
mall/dist/build/h5/static/js/pages-interest-level.c9d9aa53.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
mall/dist/build/h5/static/js/pages-order-buy.bdda131a.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
mall/dist/build/h5/static/js/pages-order-buy.d3c3d6b2.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
mall/dist/build/h5/static/js/pages-order-buy~pages-pay-index.42ffbbc2.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
mall/dist/build/h5/static/js/pages-order-buy~pages-pay-index.ef7fbc45.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
mall/dist/build/h5/static/js/pages-order-detail.3916dd01.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
mall/dist/build/h5/static/js/pages-order-detail.c11b23db.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
mall/dist/build/h5/static/js/pages-pay-index.106457d0.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
mall/dist/build/h5/static/js/pages-pay-index.bb830b1b.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
mall/dist/build/h5/static/js/qqmap-wx-jssdk.min.js


+ 25 - 25
mall/src/components/app-coupon-sel.vue
Просмотреть файл 

@@ -28,7 +28,6 @@
 
               @click="couponChange(item, index + 1)"
 
             >
 
               <div class="list-img">
 
-                <!-- 已过期 -->
 
                 <template v-if="couponSelInx && couponSelInx == (index + 1)">
 
                   <img :src="`${constant.imgUrl}/retail/coupon/is-check.png`" alt mode="widthFix" />
 
                 </template>
 
@@ -36,7 +35,6 @@
 
                   <img :src="`${constant.imgUrl}/retail/coupon/no-check.png`" alt mode="widthFix" />
 
                 </template>
 
               </div>
 
-              <!-- 列表 -->
 
               <div class="list-det">
 
                 <div class="list-det-left">
 
                   <div class="price-wrap">
 
@@ -67,13 +65,7 @@ import { userDiscount } from "@/api/member";
 
 import { getShopUser } from "@/utils/auth";
 
 export default {
 
   name: "coupon-sel",
 
-  props: {
 
-    // 金额
 
-    price: {
 
-      type: [String, Number],
 
-      default: 0
 
-    }
 
-  },
 
+  props: {},
 
   data() {
 
     return {
 
       constant: this.$constant,
 
@@ -96,23 +88,16 @@ export default {
 
         newArr.push("member");
 
         this.selIndex = 1;
 
         this.memberCheck = true;
 
+
 
+        this.$emit("calcDiscount", {
 
+          memberDiscount: this.data.member.discount,
 
+          couponDiscountAmount: 0
 
+        });
 
       }
 
       if (!this.$util.isEmpty(this.data.coupon)) {
 
         newArr.push("coupon");
 
       }
 
       return newArr;
 
-    },
 
-    // 优惠金额
 
-    totalDiscountPrice() {
 
-      if (this.price) {
 
-        return (
 
-          (this.price * 1000000 -
 
-            ((this.price * this.shopUser.userAsset.discount) / 10) * 1000000) /
 
-          1000000
 
-        );
 
-      } else {
 
-        return 0;
 
-      }
 
     }
 
   },
 
   mounted() {},
 
@@ -127,18 +112,33 @@ export default {
 
     },
 
     checkChange(e) {
 
       this.selIndex = e.detail.value;
 
-      console.log('radio')
 
-      console.log(this.selIndex)
 
+
 
       if (this.selIndex == 1) {
 
+        this.$emit("calcDiscount", {
 
+          memberDiscount: this.data.member.discount,
 
+          couponDiscountAmount: 0
 
+        });
 
+        this.couponSelInx = null
 
         this.couponId = 0;
 
       }
 
-      this.$emit("checkChange");
 
+
 
+      if (this.selIndex == 2) {
 
+        this.$emit("calcDiscount", {
 
+          memberDiscount: 1,
 
+          couponDiscountAmount: 0
 
+        });
 
+      }
 
     },
 
     // 优惠券选择
 
     couponChange(item, index) {
 
       this.couponSelInx = this.couponSelInx == index ? null : index;
 
       this.couponId = item.id;
 
-      this.$emit("couponChange");
 
+
 
+      this.$emit("calcDiscount", {
 
+        memberDiscount: 1,
 
+        couponDiscountAmount: item.amount
 
+      });
 
+
 
     }
 
   }
 
 };

+ 4 - 4
mall/src/components/app-delivery.vue
Просмотреть файл 

@@ -11,7 +11,7 @@
 
           placeholder-style="color:#ccc"
 
           class="tui-input"
 
           name="receiveUserName"
 
-          placeholder="请输入姓名"
 
+          placeholder="请填写姓名"
 
         />
 
       </tui-list-cell>
 
       <tui-list-cell class="line-cell" :hover="false">
 
@@ -22,12 +22,12 @@
 
           placeholder-style="color:#ccc"
 
           class="tui-input"
 
           name="receiveMobile"
 
-          placeholder="请输入电话"
 
+          placeholder="请填写电话"
 
           type="number"
 
         />
 
       </tui-list-cell>
 
       <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="openAddres">
 
-        <div class="tui-title">收花人城市</div>
 
+        <div class="tui-title">所在城市</div>
 
         <div
 
           class="tui-input"
 
           v-if="form.receiveProvince || form.receiveCity"
 
@@ -164,7 +164,7 @@
 
           placeholder-style="color:#ccc"
 
           class="tui-input"
 
           name="remark"
 
-          placeholder="请填写备注（选填）"
 
+          placeholder="请填写备注信息（选填）"
 
         />
 
       </tui-list-cell>
 
     </div>

+ 1 - 1
mall/src/components/app-swiper.vue
Просмотреть файл 

@@ -2,7 +2,7 @@
 
 	<div class="swiper-wrap" :style="{'width': widthFn,'height': heightFn}">
 
 		<swiper :indicator-dots="!tagShow" :autoplay="autoplay" :interval="5000" :duration="150" class="tui-banner-swiper" :circular="true" indicator-color="#969696" indicator-active-color="#F04545" @change="bannerChange">
 
 			<swiper-item v-for="(item, index) in list" :key="index" @tap.stop="detail">
 
-				<img :src="item.img" class="tui-slide-image" mode="center" />
 
+				<img :src="item.img" class="tui-slide-image" mode="aspectFit" />
 
 			</swiper-item>
 
 		</swiper>
 
 		<app-tag v-if="tagShow" class="swiper-tag" type="translucent" shape="circleLeft" size="small">{{index + 1}}/{{list.length}}</app-tag>

+ 1 - 1
mall/src/components/plugin/modal.vue
Просмотреть файл 

@@ -161,7 +161,7 @@ export default {
 
 		left: 0;
 
 		right: 0;
 
 		bottom: 0;
 
-		background: rgba(0, 0, 0, 0.6);
 
+		//background: rgba(0, 0, 0, 0.6);//将黑色遮罩层先去掉，临时解决方案 shish 2020.5.16
 
 		z-index: 996;
 
 		transition: all 0.3s ease-in-out;
 
 		opacity: 0;

+ 0 - 4
mall/src/pages/home/index.vue
Просмотреть файл 

@@ -1,13 +1,9 @@
 
 <template>
 
 	<div class="app-main app-content">
 
-		<!-- <button @click="pageTo('/pages/user/register')">注册</button>
 
-		<button @click="pageTo('/pages/chat/index')">聊天</button>-->
 
-		<!-- <app-footer /> -->
 
 		<app-swiper v-if="!$util.isEmpty(ad)" :list="ad" @detail="adDetailFn" />
 
 		<block v-if="!$util.isEmpty(category)">
 
 			<div class="goods-module" v-for="(item, index) in category" :key="index">
 
 				<goods-list-big v-if="item.showRow == 1" :info="item" />
 
-				<!-- <goods-list-middle :list="[]" /> -->
 
 				<goods-list-small v-if="item.showRow == 2" :info="item" />
 
 			</div>
 
 		</block>

+ 293 - 279
mall/src/pages/interest/invite.vue
Просмотреть файл 

@@ -1,289 +1,303 @@
 
 <template>
 
-	<div class="app-content">
 
-		<div class="invite-top-wrap">
 
-			<div class="invite-top-img">
 
-				<img :src="`${constant.imgUrl}/retail/interest/invite.png`" alt mode="widthFix" />
 
-			</div>
 
-			<div class="invite-top-price-wrap">
 
-				<div class="flex-end-center">
 
-					<span class="money-text">{{ data.asset.prize }}</span>
 
-				</div>
 
-				<div class="app-color-2">
 
-					<span>受邀朋友可得</span>
 
-					<span class="app-price" style="margin: 0 4px;">{{ data.asset.amount }}</span>
 
-					<span class="app-price">元优惠券</span>
 
-				</div>
 
-			</div>
 
-			<div class="share-btn" @click="showShare = true"></div>
 
-		</div>
 
-		<div class="list-content">
 
-			<div class="invite-tabs">
 
-				<div class="tabs-list">
 
-					<div class="tabs-img">
 
-						<img :src="`${constant.imgUrl}/retail/interest/invited.png`" alt mode="widthFix" />
 
-					</div>
 
-					<div class="tab-list-right">
 
-						<div class>已邀请(人)</div>
 
-						<div class="tabs-num">{{ data.stat.inviteNum }}</div>
 
-					</div>
 
-				</div>
 
-				<div class="tabs-list">
 
-					<div class="tabs-img">
 
-						<img :src="`${constant.imgUrl}/retail/interest/ordered.png`" alt mode="widthFix" />
 
-					</div>
 
-					<div class="tabs-list-right">
 
-						<div class>已下单(人)</div>
 
-						<div class="tabs-num">{{ data.stat.orderNum }}</div>
 
-					</div>
 
-				</div>
 
-			</div>
 
-			<!-- 邀请记录 -->
 
-			<div class="invite-list-blo">
 
-				<div class="invite-list-tit flex-center-between">
 
-					<div class="app-size-30">邀请记录</div>
 
-					<div class="flex-center-end app-color-3" @click="showAlert = true">
 
-						<span>规则说明</span>
 
-						<i class="iconfont iconchangjianwentixiangguanwenti2"></i>
 
-					</div>
 
-				</div>
 
-				<div class="invite-list-wrap">
 
-					<block v-if="!$util.isEmpty(list)">
 
-						<div class="invite-list flex-center-between" v-for="(item, index) in list" :key="index">
 
-							<div class="list-left flex-center-start">
 
-								<div class="list-img">
 
-									<img :src="item.userAvatar" alt mode="widthFix" />
 
-								</div>
 
-								<div class>
 
-									<div class="app-size-30">{{ item.userName }}</div>
 
-									<div class="app-color-3 invite-list-status">
 
-										<block v-if="item.status == 0">
 
-											<span>{{ item.addTime | formatTime }}</span>
 
-											<span>领券</span>
 
-										</block>
 
-										<block v-else-if="item.status == 1">
 
-											<span>{{ item.orderTime | formatTime }}</span>
 
-											<span>下单</span>
 
-											<span class="app-price">¥{{ item.amount }}</span>
 
-										</block>
 
-										<block v-else-if="item.status == 2">
 
-											<span>{{ item.giveTime | formatTime }}</span>
 
-											<span>兑奖</span>
 
-										</block>
 
-									</div>
 
-								</div>
 
-							</div>
 
-							<div class="app-size-26">{{ item.status | constantfilter('INVITE_STATUS') }}</div>
 
-						</div>
 
-					</block>
 
-					<block v-else>
 
-						<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 
-					</block>
 
-					<!-- <div class="load-more flex-center-center app-color-3">加载更多...</div> -->
 
-				</div>
 
-			</div>
 
-		</div>
 
-		<!-- 弹窗 -->
 
-		<alert-module :show="showAlert" @click="hideAlert" @cancel="hideAlert">
 
-			<div class="alt-wrap">
 
-				<div class="alt-tit app-size-34">规则说明</div>
 
-				<div class="alt-content">
 
-					<div>1、邀请有礼活动老客可以获得奖励，新客可以获得超值优惠券；</div>
 
-					<div>2、只有本店老客户才能发起邀请；</div>
 
-					<div>3、只有本店新客户才能接受邀请；</div>
 
-					<div>4、本活动只能邀请自己的朋友，请勿滥发邀请链接，否则取消邀请权力。</div>
 
-				</div>
 
-			</div>
 
-		</alert-module>
 
-		<app-share-mask :show="showShare" @click="hideShare" />
 
-	</div>
 
+  <div class="app-content">
 
+    <div class="invite-top-wrap">
 
+      <div class="invite-top-img">
 
+        <img :src="`${constant.imgUrl}/retail/interest/invite.png`" alt mode="widthFix" />
 
+      </div>
 
+      <div class="invite-top-price-wrap">
 
+        <div class="flex-end-center">
 
+          <span class="money-text">{{ data.asset.prize }}</span>
 
+        </div>
 
+        <div class="app-color-2">
 
+          <span>受邀朋友可得</span>
 
+          <span class="app-price" style="margin: 0 4px;">{{ data.asset.amount }}</span>
 
+          <span class="app-price">元优惠券</span>
 
+        </div>
 
+      </div>
 
+      <!-- #ifdef H5 -->
 
+      <div class="share-btn" @click="showShare = true"></div>
 
+      <!-- #endif -->
 
+
 
+      <!-- #ifdef MP-WEIXIN -->
 
+      <div class="share-btn">
 
+        <button open-type="share" class="inner-btn"></button>
 
+      </div>
 
+      <!-- #endif -->
 
+    </div>
 
+    <div class="list-content">
 
+      <div class="invite-tabs">
 
+        <div class="tabs-list">
 
+          <div class="tabs-img">
 
+            <img :src="`${constant.imgUrl}/retail/interest/invited.png`" alt mode="widthFix" />
 
+          </div>
 
+          <div class="tab-list-right">
 
+            <div class>已邀请(人)</div>
 
+            <div class="tabs-num">{{ data.stat.inviteNum }}</div>
 
+          </div>
 
+        </div>
 
+        <div class="tabs-list">
 
+          <div class="tabs-img">
 
+            <img :src="`${constant.imgUrl}/retail/interest/ordered.png`" alt mode="widthFix" />
 
+          </div>
 
+          <div class="tabs-list-right">
 
+            <div class>已下单(人)</div>
 
+            <div class="tabs-num">{{ data.stat.orderNum }}</div>
 
+          </div>
 
+        </div>
 
+      </div>
 
+      <!-- 邀请记录 -->
 
+      <div class="invite-list-blo">
 
+        <div class="invite-list-tit flex-center-between">
 
+          <div class="app-size-30">邀请记录</div>
 
+          <div class="flex-center-end app-color-3" @click="showAlert = true">
 
+            <span>规则说明</span>
 
+            <i class="iconfont iconchangjianwentixiangguanwenti2"></i>
 
+          </div>
 
+        </div>
 
+        <div class="invite-list-wrap">
 
+          <block v-if="!$util.isEmpty(list)">
 
+            <div class="invite-list flex-center-between" v-for="(item, index) in list" :key="index">
 
+              <div class="list-left flex-center-start">
 
+                <div class="list-img">
 
+                  <img :src="item.userAvatar" alt mode="widthFix" />
 
+                </div>
 
+                <div class>
 
+                  <div class="app-size-30">{{ item.userName }}</div>
 
+                  <div class="app-color-3 invite-list-status">
 
+                    <block v-if="item.status == 0">
 
+                      <span>{{ item.addTime | formatTime }}</span>
 
+                      <span>领券</span>
 
+                    </block>
 
+                    <block v-else-if="item.status == 1">
 
+                      <span>{{ item.orderTime | formatTime }}</span>
 
+                      <span>下单</span>
 
+                      <span class="app-price">¥{{ item.amount }}</span>
 
+                    </block>
 
+                    <block v-else-if="item.status == 2">
 
+                      <span>{{ item.giveTime | formatTime }}</span>
 
+                      <span>兑奖</span>
 
+                    </block>
 
+                  </div>
 
+                </div>
 
+              </div>
 
+              <div class="app-size-26">{{ item.status | constantfilter('INVITE_STATUS') }}</div>
 
+            </div>
 
+          </block>
 
+          <block v-else>
 
+            <app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 
+          </block>
 
+          <!-- <div class="load-more flex-center-center app-color-3">加载更多...</div> -->
 
+        </div>
 
+      </div>
 
+    </div>
 
+    <!-- 弹窗 -->
 
+    <alert-module :show="showAlert" @click="hideAlert" @cancel="hideAlert">
 
+      <div class="alt-wrap">
 
+        <div class="alt-tit app-size-34">规则说明</div>
 
+        <div class="alt-content">
 
+          <div>1、邀请有礼活动老客可以获得奖励，新客可以获得超值优惠券；</div>
 
+          <div>2、只有本店老客户才能发起邀请；</div>
 
+          <div>3、只有本店新客户才能接受邀请；</div>
 
+          <div>4、本活动只能邀请自己的朋友，请勿滥发邀请链接，否则取消邀请权力。</div>
 
+        </div>
 
+      </div>
 
+    </alert-module>
 
+    <app-share-mask :show="showShare" @click="hideShare" />
 
+  </div>
 
 </template>
 
 
 <script>
 
-	import { mapGetters } from 'vuex'
 
-	import AppWrapperEmpty from '@/components/app-wrapper-empty'
 
-	import AlertModule from '@/components/plugin/alert'
 
-	import AppShareMask from '@/components/module/app-share-mask'
 
-	import { share } from '@/mixins'
 
-	// api
 
-	import { getShopUser } from '@/utils/auth'
 
-	import { getList, getProfile } from '@/api/invite'
 
-	export default {
 
-		name: 'invite',
 
-		components: {
 
-			AlertModule,
 
-			AppShareMask,
 
-			AppWrapperEmpty
 
-		},
 
-		mixins: [share],
 
-		data() {
 
-			return {
 
-				data: {
 
-					constant: this.$constant,
 
-					stat: {},
 
-					asset: {}
 
-				},
 
-				list: [],
 
-				showAlert: false,
 
-				showShare: false
 
-			}
 
-		},
 
-		computed: {
 
-			...mapGetters({ shopUser: 'getShopUser' })
 
-		},
 
-		onLoad() {
 
-			// this.init()
 
-		},
 
-		methods: {
 
-			init() {
 
-				// #ifdef H5
 
-				// 微信二次分享
 
-				let href = window.location.href
 
-				if (href.indexOf('from=singlemessage') > 0) {
 
-					location.href = `${this.$constant.formal}/#/pages/interest/invite${this.$util.parse(this.option)}`
 
-					return false
 
-				}
 
-				// #endif
 
-
 
-				this._getProfile()
 
-				this._getList()
 
-
 
-				getShopUser().then(res => {
 
-					console.log('this.data', res)
 
+import { mapGetters } from "vuex";
 
+import AppWrapperEmpty from "@/components/app-wrapper-empty";
 
+import AlertModule from "@/components/plugin/alert";
 
+import AppShareMask from "@/components/module/app-share-mask";
 
+import { share } from "@/mixins";
 
+// api
 
+import { getShopUser } from "@/utils/auth";
 
+import { getList, getProfile } from "@/api/invite";
 
+export default {
 
+  name: "invite",
 
+  components: {
 
+    AlertModule,
 
+    AppShareMask,
 
+    AppWrapperEmpty
 
+  },
 
+  mixins: [share],
 
+  data() {
 
+    return {
 
+      data: {
 
+        constant: this.$constant,
 
+        stat: {},
 
+        asset: {}
 
+      },
 
+      list: [],
 
+      showAlert: false,
 
+      showShare: false
 
+    };
 
+  },
 
+  computed: {
 
+    ...mapGetters({ shopUser: "getShopUser" })
 
+  },
 
+  onLoad() {
 
+    // this.init()
 
+  },
 
+  methods: {
 
+    init() {
 
+      // #ifdef H5
 
+      // 微信二次分享
 
+      let href = window.location.href;
 
+      if (href.indexOf("from=singlemessage") > 0) {
 
+        location.href = `${
 
+          this.$constant.formal
 
+        }/#/pages/interest/invite${this.$util.parse(this.option)}`;
 
+        return false;
 
+      }
 
+      // #endif
 
 
-					// 设置分享
 
-					let shareParams = {
 
-						title: `${res.merchantName}`, // 分享标题
 
-						desc: '这家店不错推荐给你', // 分享内容
 
-						imgUrl: res.smallAvatarUrl,
 
-						// #ifdef H5
 
-						pagePath: `${window.location.protocol}//mall.${this.$constant.firstHost}.com/#/pages/home/shop?account=${res.merchantId}&introUserId=${res.id}`,
 
-						// #endif
 
-						// #ifndef H5
 
-						pagePath: `/pages/home/shop?account=${res.merchantId}&introUserId=${res.id}`
 
-						// #endif
 
-					}
 
-					this.jweixinFn(shareParams)
 
+      this._getProfile();
 
+      this._getList();
 
 
-				})
 
-			},
 
-			_getProfile() {
 
-				getProfile().then(res => {
 
-					this.data = res.data
 
-				})
 
-			},
 
-			_getList() {
 
-				return getList().then(res => {
 
-					if (this.$util.isEmpty(res.data.list)) return false
 
-					this.list = res.data.list
 
-				})
 
-			},
 
-			hideAlert() {
 
-				this.showAlert = false
 
-			},
 
-			hideShare() {
 
-				this.showShare = false
 
-			}
 
-		}
 
-	}
 
+      getShopUser().then(res => {
 
+        // 设置分享
 
+        let shareParams = {
 
+          title: `${res.merchantName}`, // 分享标题
 
+          desc: "这家店不错推荐给你", // 分享内容
 
+          imgUrl: res.smallAvatarUrl,
 
+          // #ifdef H5
 
+          pagePath: `${window.location.protocol}//mall.${this.$constant.firstHost}.com/#/pages/home/shop?account=${res.merchantId}&introUserId=${res.id}`,
 
+          // #endif
 
+          // #ifndef H5
 
+          pagePath: `/pages/home/shop?account=${res.merchantId}&introUserId=${res.id}`
 
+          // #endif
 
+        };
 
+        this.jweixinFn(shareParams);
 
+      });
 
+    },
 
+    _getProfile() {
 
+      getProfile().then(res => {
 
+        this.data = res.data;
 
+      });
 
+    },
 
+    _getList() {
 
+      return getList().then(res => {
 
+        if (this.$util.isEmpty(res.data.list)) return false;
 
+        this.list = res.data.list;
 
+      });
 
+    },
 
+    hideAlert() {
 
+      this.showAlert = false;
 
+    },
 
+    hideShare() {
 
+      this.showShare = false;
 
+    }
 
+  }
 
+};
 
 </script>
 
 
 <style lang="scss" scoped>
 
-	.app-content {
 
-		width: 100%;
 
-		// position: relative;
 
-		// 弹窗
 
-		/deep/.tui-alert-content {
 
-			padding: 40px 40px 0;
 
-		}
 
-		.alt-wrap {
 
-			.alt-content {
 
-				margin-top: 30px;
 
-				margin-bottom: 30px;
 
-				text-align: left;
 
-				color: $fontColor2;
 
-			}
 
-		}
 
-	}
 
-	.invite-top-wrap {
 
-		position: relative;
 
-		.invite-top-price-wrap {
 
-			position: absolute;
 
-			top: 120px;
 
-			left: 0;
 
-			right: 0;
 
-			text-align: center;
 
-			.flex-end-center {
 
-				margin-top: 20px;
 
-				margin-bottom: 40px;
 
-			}
 
-			.money-text {
 
-				color: $mainColor;
 
-				font-size: 50px;
 
-			}
 
-		}
 
-		.share-btn {
 
-			position: absolute;
 
-			top: 400px;
 
-			width: 100%;
 
-			height: 180px;
 
-		}
 
-	}
 
-	.list-content {
 
-		position: relative;
 
-		top: -100px;
 
-		width: 96%;
 
-		margin: 0 auto;
 
-	}
 
-	.invite-tabs {
 
-		padding: 20px 60px 24px;
 
-		// border-bottom: 20px solid #f5f5f5;
 
-		margin-bottom: 20px;
 
-		color: $fontColor3;
 
-		border-radius: 10px;
 
-		background-color: #fff;
 
-		@include disFlex(center, space-between);
 
-		.tabs-list {
 
-			@include disFlex(center, flex-end);
 
-		}
 
-		.tabs-img {
 
-			width: 90px;
 
-			margin-right: 20px;
 
-		}
 
-		.tabs-num {
 
-			font-size: 40px;
 
-			color: #ff5400;
 
-			margin-top: 8px;
 
-		}
 
-	}
 
-	.invite-list-blo {
 
-		padding: 20px 20px 24px;
 
-		border-radius: 10px;
 
-		background-color: #fff;
 
-		.invite-list-tit {
 
-			margin-bottom: 20px;
 
-			.iconfont {
 
-				margin-left: 10px;
 
-				font-size: 34px;
 
-			}
 
-		}
 
-		.invite-list-wrap {
 
-			.invite-list {
 
-				padding: 14px 0;
 
-				border-bottom: 1px solid $borderColor;
 
-			}
 
-			.list-img {
 
-				width: 80px;
 
-				margin-right: 20px;
 
-			}
 
-			.invite-list-status {
 
-				span {
 
-					margin-right: 10px;
 
-				}
 
-			}
 
-			// 加载更多
 
-			.load-more {
 
-				padding: 24px 0 6px;
 
-			}
 
-		}
 
-	}
 
+.app-content {
 
+  width: 100%;
 
+  /deep/.tui-alert-content {
 
+    padding: 40px 40px 0;
 
+  }
 
+  .alt-wrap {
 
+    .alt-content {
 
+      margin-top: 30px;
 
+      margin-bottom: 30px;
 
+      text-align: left;
 
+      color: $fontColor2;
 
+    }
 
+  }
 
+}
 
+.invite-top-wrap {
 
+  position: relative;
 
+  .invite-top-price-wrap {
 
+    position: absolute;
 
+    top: 120px;
 
+    left: 0;
 
+    right: 0;
 
+    text-align: center;
 
+    .flex-end-center {
 
+      margin-top: 20px;
 
+      margin-bottom: 40px;
 
+    }
 
+    .money-text {
 
+      color: $mainColor;
 
+      font-size: 48px;
 
+    }
 
+  }
 
+  .share-btn {
 
+    position: absolute;
 
+    top: 400px;
 
+    width: 100%;
 
+    height: 180px;
 
+    .inner-btn {
 
+      height: 104rpx;
 
+      width: 420rpx;
 
+      background-color: transparent;
 
+      margin-top: 48rpx;
 
+    }
 
+    .inner-btn::after {
 
+      border: none;
 
+    }
 
+  }
 
+}
 
+.list-content {
 
+  position: relative;
 
+  top: -100px;
 
+  width: 96%;
 
+  margin: 0 auto;
 
+}
 
+.invite-tabs {
 
+  padding: 20px 60px 24px;
 
+  // border-bottom: 20px solid #f5f5f5;
 
+  margin-bottom: 20px;
 
+  color: $fontColor3;
 
+  border-radius: 10px;
 
+  background-color: #fff;
 
+  @include disFlex(center, space-between);
 
+  .tabs-list {
 
+    @include disFlex(center, flex-end);
 
+  }
 
+  .tabs-img {
 
+    width: 90px;
 
+    margin-right: 20px;
 
+  }
 
+  .tabs-num {
 
+    font-size: 40px;
 
+    color: #ff5400;
 
+    margin-top: 8px;
 
+  }
 
+}
 
+.invite-list-blo {
 
+  padding: 20px 20px 24px;
 
+  border-radius: 10px;
 
+  background-color: #fff;
 
+  .invite-list-tit {
 
+    margin-bottom: 20px;
 
+    .iconfont {
 
+      margin-left: 10px;
 
+      font-size: 34px;
 
+    }
 
+  }
 
+  .invite-list-wrap {
 
+    .invite-list {
 
+      padding: 14px 0;
 
+      border-bottom: 1px solid $borderColor;
 
+    }
 
+    .list-img {
 
+      width: 80px;
 
+      margin-right: 20px;
 
+    }
 
+    .invite-list-status {
 
+      span {
 
+        margin-right: 10px;
 
+      }
 
+    }
 
+    // 加载更多
 
+    .load-more {
 
+      padding: 24px 0 6px;
 
+    }
 
+  }
 
+}
 
 </style>

+ 2 - 4
mall/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">
 
@@ -25,19 +25,17 @@
 
 				<div class="level-list-blo">
 
 					<div class="level-list" v-for="(item, index) in list" :key="index">
 
 						<div>
 
-							<appVipModule class="level-img" :text="`VIP${item.level}`" />
 
+							<appVipModule class="level-img" :vipImgUrl="`${constant.imgUrl}/retail/interest/vip.png`" :text="`VIP${item.level}`" />
 
 						</div>
 
 						<div>{{ item.growth }}</div>
 
 						<div>{{ item.discount }}</div>
 
 					</div>
 
 				</div>
 
 			</div>
 
-            <!-- 按钮 -->
 
             <div class="btn-wrap">
 
                 <div class="button-com red big" @click="pageTo('/pages/user/register')">申请成为会员</div>
 
             </div>
 
 		</div>
 
-        <!-- 商标 -->
 
         <app-trademark-module />
 
 	</div>
 
 </template>

+ 44 - 15
mall/src/pages/order/buy.vue
Просмотреть файл 

@@ -58,7 +58,11 @@
 
       <div class="module-com discount-wrap" v-if="!$util.isEmpty(discountArr)">
 
         <div class="module-tit">可选优惠</div>
 
         <div class="module-det">
 
-          <app-coupon-sel ref="couponSel" :price="totalPrice" :discountArr="['member', 'coupon']" />
 
+          <app-coupon-sel
 
+            ref="couponSel"
 
+            @calcDiscount="calcDiscount"
 
+            :discountArr="['member', 'coupon']"
 
+          />
 
         </div>
 
       </div>
 
       <app-trademark />
 
@@ -149,20 +153,27 @@ export default {
 
       //显示的距离
 
       showDistance: 0,
 
       totalPrice: 0,
 
-      mayPayAmount: 0
 
+      memberDiscount: 1,
 
+      couponDiscountAmount: 0
 
     };
 
   },
 
   mounted() {},
 
   computed: {
 
     ...mapGetters({ orderShop: "getOrderShop" }),
 
-    ...mapGetters({ shopUser: "getShopUser" })
 
+    ...mapGetters({ shopUser: "getShopUser" }),
 
+    mayPayAmount: function() {
 
+      let price =
 
+        (this.goodsInfo.price * this.goodsInfo.buyNum + this.freightPrice) *
 
+          this.memberDiscount -
 
+        this.couponDiscountAmount;
 
+      return price.toFixed(2);
 
+    }
 
   },
 
   watch: {
 
     //运费变化则总金额和应付金额变化
 
     freightPrice(newVal) {
 
       let price = this.goodsInfo.price * this.goodsInfo.buyNum + newVal;
 
       this.totalPrice = price.toFixed(2);
 
-      this.mayPayAmount = price.toFixed(2);
 
     }
 
   },
 
   onLoad(option) {
 
@@ -190,13 +201,17 @@ export default {
 
       this.goodsInfo = goodsInfo;
 
 
       this.totalPrice = goodsInfo.price * this.option.goodsNum;
 
-      this.mayPayAmount = this.totalPrice;
 
 
       // 初始化上个页面带入的值
 
       Object.keys(this.form).forEach((i, index) => {
 
         this.form[i] = this.option[i];
 
       });
 
     },
 
+    //最终会员优惠的折扣和优惠券优惠金额
 
+    calcDiscount(discountData) {
 
+      this.memberDiscount = discountData.memberDiscount;
 
+      this.couponDiscountAmount = discountData.couponDiscountAmount;
 
+    },
 
     // 生成订单
 
     createOrderFn() {
 
       let addForm = {};
 
@@ -206,6 +221,29 @@ export default {
 
       if (this.$refs.couponSel) {
 
         addForm.couponId = this.$refs.couponSel.couponId;
 
       }
 
+      if (this.tabIndex == 0) {
 
+        let receiveUserName = form.receiveUserName;
 
+        if (this.$util.isEmpty(receiveUserName)) {
 
+          this.$msg("请填写收花人姓名");
 
+          return false;
 
+        }
 
+        let receiveMobile = form.receiveMobile;
 
+        if (this.$util.isEmpty(receiveMobile)) {
 
+          this.$msg("请填写收花人电话");
 
+          return false;
 
+        }
 
+        let reachTime = form.reachTime;
 
+        let receiveAddress = form.receiveAddress;
 
+        if (this.$util.isEmpty(receiveAddress)) {
 
+          this.$msg("请填写地址！");
 
+          return false;
 
+        }
 
+        if (this.$util.isEmpty(reachTime) || reachTime == 0) {
 
+          this.$msg("请填写送达时间！");
 
+          return false;
 
+        }
 
+      }
 
+
 
       createOrder({
 
         needSend: this.tabIndex == 0 ? "1" : "0",
 
         ...form,
 
@@ -224,7 +262,6 @@ export default {
 
       });
 
     },
 
     confirmFn() {
 
-      console.log(this.$refs.appDelivery);
 
       this.createOrderFn();
 
     },
 
     tabChange(e) {
 
@@ -248,17 +285,9 @@ export default {
 
     },
 
     // 表单验证
 
     formSubmit(e) {
 
-      let rules = [
 
-        // {
 
-        // 	name: 'receiveUserName',
 
-        // 	rule: ['required'],
 
-        // 	msg: ['请输入姓名']
 
-        // }
 
-      ];
 
-      // 进行表单检查
 
+      let rules = [];
 
       let formData = e.detail.value;
 
       let checkRes = form.validation(formData, rules);
 
-      // 验证通过!
 
       if (!checkRes) {
 
         this.confirmFn();
 
       } else {

+ 240 - 230
store/src/admin/home/member.vue
Просмотреть файл 

@@ -1,249 +1,259 @@
 
 <template>
 
-	<div class="app-main app-content">
 
-		<app-tabs :tabs="tabs" :isFixed="true" :isAdd="true" :currentTab="tabIndex" :height="100" @add="pageTo('/admin/member/add')" @change="change" itemWidth="33.33%" />
 
-		<!-- list -->
 
-		<block v-if="!$util.isEmpty(list.data)">
 
-			<block v-for="(item,index) in list.data" :key="index">
 
-				<tui-list-cell :arrow="true" @click="pageTo({
 
+  <div class="app-main app-content">
 
+    <app-tabs
 
+      :tabs="tabs"
 
+      :isFixed="true"
 
+      :isAdd="true"
 
+      :currentTab="tabIndex"
 
+      :height="100"
 
+      @add="pageTo('/admin/member/add')"
 
+      @change="change"
 
+      itemWidth="33.33%"
 
+    />
 
+    <!-- list -->
 
+    <block v-if="!$util.isEmpty(list.data)">
 
+      <block v-for="(item,index) in list.data" :key="index">
 
+        <tui-list-cell
 
+          :arrow="true"
 
+          @click="pageTo({
 
 					url: '/admin/member/detail',
 
 					query: {
 
 						id: item.id
 
 					}
 
-				})">
 
-					<div class="tui-msg-box">
 
-						<img :src="item.avatarUrl" class="tui-msg-pic" mode="widthFix" />
 
-						<div class="tui-msg-item">
 
-							<div class="tui-msg-name">
 
-                                <div class="user-name">{{item.userName}}</div>
 
-								<!-- `${constant.imgUrl}/retail/interest/vip.png` -->
 
-								<!-- item.isMember -->
 
-							    <appVipModule 
-									:vipImg="`${constant.imgUrl}/retail/interest/vip.png`"
 
-									v-if="item.member >= 0" 
-									class="level-img" 
-									:text="`VIP ${item.member || ''}`" />
 
-									<div v-else class="normal-img">
 
-										<div class="vip-text">普通用户</div>
 
-									</div>
 
-                            </div>
 
-							<div class="tui-msg-content">
 
-                                <div class="icon-wrap">
 
-                                    <i class="iconfont iconzhifubao"></i>
 
-                                </div>
 
-                                <span>{{item.visitTimeFormat}}</span>
 
-                            </div>
 
-						</div>
 
-					</div>
 
-					<div class="tui-msg-right">
 
-						<badge-module type="danger" :dot="item.level==3?true:false" v-if="item.messageNum>0">{{item.messageNum}}</badge-module>
 
-					</div>
 
-				</tui-list-cell>
 
-			</block>
 
-		</block>
 
-		<block v-else>
 
-			<app-wrapper-empty :is-empty="$util.isEmpty(list.data)" />
 
-		</block>
 
-	</div>
 
+				})"
 
+        >
 
+          <div class="tui-msg-box">
 
+            <img :src="item.avatarUrl" class="tui-msg-pic" mode="widthFix" />
 
+            <div class="tui-msg-item">
 
+              <div class="tui-msg-name">
 
+                <div class="tui-user-name">{{item.userName}}</div>
 
+                <appVipModule
 
+                  v-if="item.member >= 0"
 
+                  class="level-img"
 
+                  :vipImg="`${constant.imgUrl}/retail/interest/vip.png`"
 
+                  :text="`VIP ${item.userAsset.member}`"
 
+                />
 
+                <div v-else class="normal-img">
 
+                  <div class="vip-text">普通用户</div>
 
+                </div>
 
+              </div>
 
+              <div class="tui-msg-content">
 
+                <div class="icon-wrap">
 
+                  <i class="iconfont iconzhifubao" style="font-size:30rpx;"></i>
 
+                </div>
 
+                <span>{{item.visitTimeFormat}}</span>
 
+              </div>
 
+            </div>
 
+          </div>
 
+          <div class="tui-msg-right">
 
+            <badge-module
 
+              type="danger"
 
+              :dot="item.level==3?true:false"
 
+              v-if="item.messageNum>0"
 
+            >{{item.messageNum}}</badge-module>
 
+          </div>
 
+        </tui-list-cell>
 
+      </block>
 
+    </block>
 
+    <block v-else>
 
+      <app-wrapper-empty :is-empty="$util.isEmpty(list.data)" />
 
+    </block>
 
+  </div>
 
 </template>
 
 
 <script>
 
-import AppTabs from '@/components/plugin/tabs'
 
-import TuiListCell from '@/components/plugin/list-cell'
 
-import BadgeModule from '@/components/plugin/badge'
 
-import AppWrapperEmpty from '@/components/app-wrapper-empty'
 
-import appVipModule from '@/components/module/app-vip'
 
+import AppTabs from "@/components/plugin/tabs";
 
+import TuiListCell from "@/components/plugin/list-cell";
 
+import BadgeModule from "@/components/plugin/badge";
 
+import AppWrapperEmpty from "@/components/app-wrapper-empty";
 
+import appVipModule from "@/components/module/app-vip";
 
 // api
 
-import { list } from '@/mixins'
 
-import { getClass, getList } from '@/api/member'
 
+import { list } from "@/mixins";
 
+import { getClass, getList } from "@/api/member";
 
 export default {
 
-	name: 'admin-memebr',
 
-	components: {
 
-		AppTabs,
 
-		TuiListCell,
 
-		BadgeModule,
 
-		AppWrapperEmpty,
 
-		appVipModule
 
-	},
 
-	mixins: [list],
 
-	data() {
 
-		return {
 
-			tabIndex: 0,
 
-			constant: this.$constant,
 
-			tabs: [
 
-				{
 
-					name: '全部',
 
-					value: 0
 
-				},
 
-				{
 
-					name: '粉丝',
 
-					value: 0
 
-				},
 
-				{
 
-					name: '会员',
 
-					value: 0
 
-				}
 
-			]
 
-		}
 
-	},
 
-	onPullDownRefresh() {
 
-		this.resetList()
 
-		this._list().then(res => {
 
-			uni.stopPullDownRefresh()
 
-		})
 
-	},
 
-	onReachBottom() {
 
-		if (!this.list.finished) {
 
-			this._list().then(res => {
 
-				uni.stopPullDownRefresh()
 
-			})
 
-		} else {
 
-			uni.stopPullDownRefresh()
 
-		}
 
-	},
 
-	onLoad(option) {
 
-		// this.init()
 
-	},
 
-	methods: {
 
-		init() {
 
-			this._list()
 
-		},
 
-		// 列表
 
-		_list() {
 
-			let status = JSON.parse(JSON.stringify(this.tabIndex))
 
-			status = status == 0 ? -1 : status
 
-			return getList({
 
-				search: '',
 
-				page: this.list.page,
 
-				status: status,
 
-				...this.form
 
-			}).then(res => {
 
-				this.completes(res)
 
-				if (this.$util.isEmpty(res.data)) return false
 
-				this.tabs[0].value = res.data.asset.totalUser
 
-				this.tabs[1].value = res.data.asset.totalFans
 
-				this.tabs[2].value = res.data.asset.totalMember
 
-			})
 
-		},
 
-		change(e) {
 
-			if (this.tabIndex == e.index) {
 
-				return false
 
-			} else {
 
-				this.tabIndex = e.index
 
-				this.resetList()
 
-				this._list()
 
-			}
 
-		},
 
-		// 跳转
 
-		detail(item) {
 
-			this.$util.pageTo('/admin/member/detail')
 
-		}
 
-	}
 
-}
 
+  name: "admin-memebr",
 
+  components: {
 
+    AppTabs,
 
+    TuiListCell,
 
+    BadgeModule,
 
+    AppWrapperEmpty,
 
+    appVipModule
 
+  },
 
+  mixins: [list],
 
+  data() {
 
+    return {
 
+      tabIndex: 0,
 
+      tabs: [
 
+        {
 
+          name: "全部",
 
+          value: 0
 
+        },
 
+        {
 
+          name: "粉丝",
 
+          value: 0
 
+        },
 
+        {
 
+          name: "会员",
 
+          value: 0
 
+        }
 
+      ]
 
+    };
 
+  },
 
+  onPullDownRefresh() {
 
+    this.resetList();
 
+    this._list().then(res => {
 
+      uni.stopPullDownRefresh();
 
+    });
 
+  },
 
+  onReachBottom() {
 
+    if (!this.list.finished) {
 
+      this._list().then(res => {
 
+        uni.stopPullDownRefresh();
 
+      });
 
+    } else {
 
+      uni.stopPullDownRefresh();
 
+    }
 
+  },
 
+  onLoad(option) {
 
+    // this.init()
 
+  },
 
+  methods: {
 
+    init() {
 
+      this._list();
 
+    },
 
+    // 列表
 
+    _list() {
 
+      let status = JSON.parse(JSON.stringify(this.tabIndex));
 
+      status = status == 0 ? -1 : status;
 
+      return getList({
 
+        search: "",
 
+        page: this.list.page,
 
+        status: status,
 
+        ...this.form
 
+      }).then(res => {
 
+        this.completes(res);
 
+        if (this.$util.isEmpty(res.data)) return false;
 
+        this.tabs[0].value = res.data.asset.totalUser;
 
+        this.tabs[1].value = res.data.asset.totalFans;
 
+        this.tabs[2].value = res.data.asset.totalMember;
 
+      });
 
+    },
 
+    change(e) {
 
+      if (this.tabIndex == e.index) {
 
+        return false;
 
+      } else {
 
+        this.tabIndex = e.index;
 
+        this.resetList();
 
+        this._list();
 
+      }
 
+    },
 
+    // 跳转
 
+    detail(item) {
 
+      this.$util.pageTo("/admin/member/detail");
 
+    }
 
+  }
 
+};
 
 </script>
 
 
 <style lang="scss" scoped>
 
-	.app-content {
 
-		padding-top: 120px;
 
-		padding-bottom: 20px;
 
-	}
 
-	.tabs-wrap {
 
-		position: fixed;
 
-		.tabs-left {
 
-			width: 80%;
 
-		}
 
-		.tabs-right {
 
-			width: 19%;
 
-			border-left: $borderColor;
 
-			@include disFlex(center, center);
 
-		}
 
-	}
 
-	// list
 
-	.tui-msg-box {
 
-		display: flex;
 
-		align-items: center;
 
+.app-content {
 
+  padding-top: 120px;
 
+  padding-bottom: 20px;
 
+}
 
+.tabs-wrap {
 
+  position: fixed;
 
+  .tabs-left {
 
+    width: 80%;
 
+  }
 
+  .tabs-right {
 
+    width: 19%;
 
+    border-left: $borderColor;
 
+    @include disFlex(center, center);
 
+  }
 
+}
 
+// list
 
+.tui-msg-box {
 
+  display: flex;
 
+  align-items: center;
 
 
-		.tui-msg-pic {
 
-			width: 80upx;
 
-			height: 80upx;
 
-			border-radius: 50%;
 
-            margin-right: 20upx;
 
-		}
 
+  .tui-msg-pic {
 
+    width: 80upx;
 
+    height: 80upx;
 
+    border-radius: 50%;
 
+    margin-right: 20upx;
 
+  }
 
 
-		.tui-msg-item {
 
-			max-width: 500upx;
 
-			min-height: 80upx;
 
-			overflow: hidden;
 
-			display: flex;
 
-			flex-direction: column;
 
-            justify-content: space-between;
 
-            & > div {
 
-                @include disFlex(center, flex-start);
 
-                & > div:first-child {
 
-                    margin-right: 8px;
 
-                }
 
-            }
 
-            .level-img {
 
-                width: 74px;
 
-                /deep/.vip-text {
 
-                    top: 0;
 
-                    left: 20px;
 
-                    font-weight: 400;
 
-                    transform: scale(0.5);
 
-                }
 
-            }
 
-			.normal-img {
 
-                width: 70px;
 
-				padding: 2px 6px;
 
-				color: #999;
 
-				background-color: #F0F2F6;
 
-				border-radius: 20px;
 
-				.vip-text {
 
-					font-size: 24px;
 
-                	transform: scale(0.6);
 
-					position: relative;
 
-					top: -2px;
 
-					left: -8px;
 
-				}
 
-			}
 
-            .iconfont {
 
-                color: #00AAED;
 
-            }
 
-		}
 
+  .tui-msg-item {
 
+    max-width: 500upx;
 
+    min-height: 80upx;
 
+    overflow: hidden;
 
+    display: flex;
 
+    flex-direction: column;
 
+    justify-content: space-between;
 
+    & > div {
 
+      @include disFlex(center, flex-start);
 
+      & > div:first-child {
 
+        margin-right: 8px;
 
+      }
 
+    }
 
+    .level-img {
 
+      /deep/.vip-text {
 
+        left: 42px;
 
+      }
 
+    }
 
+    .normal-img {
 
+      width: 70px;
 
+      padding: 2px 6px;
 
+      color: #999;
 
+      background-color: #f0f2f6;
 
+      border-radius: 20px;
 
+      .vip-text {
 
+        font-size: 24px;
 
+        transform: scale(0.6);
 
+        position: relative;
 
+        top: -2px;
 
+        left: -8px;
 
+      }
 
+    }
 
+    .iconfont {
 
+      color: #00aaed;
 
+    }
 
+  }
 
 
-		.tui-msg-name {
 
-			overflow: hidden;
 
-			white-space: nowrap;
 
-			text-overflow: ellipsis;
 
-			font-size: 30upx;
 
-			line-height: 1;
 
-			color: #262b3a;
 
-			& .user-name {
 
-				max-width: 260px;
 
-				overflow: hidden;
 
-				text-overflow: ellipsis;
 
-				white-space: nowrap; 
-			}
 
-		}
 
+  .tui-msg-name {
 
+    overflow: hidden;
 
+    white-space: nowrap;
 
+    text-overflow: ellipsis;
 
+    font-size: 30upx;
 
+    line-height: 1;
 
+    color: #262b3a;
 
+    .tui-user-name {
 
+      overflow: hidden;
 
+      text-overflow: ellipsis;
 
+      white-space: nowrap;
 
+      width: 180rpx;
 
+    }
 
+  }
 
 
-		.tui-msg-content {
 
-			overflow: hidden;
 
-			white-space: nowrap;
 
-			text-overflow: ellipsis;
 
-			font-size: 24upx;
 
-			line-height: 1;
 
-			color: #9397a4;
 
-		}
 
-	}
 
+  .tui-msg-content {
 
+    overflow: hidden;
 
+    white-space: nowrap;
 
+    text-overflow: ellipsis;
 
+    font-size: 24upx;
 
+    line-height: 1;
 
+    color: #9397a4;
 
+  }
 
+}
 
 
-	.tui-msg-right {
 
-		max-width: 120upx;
 
-		height: 80upx;
 
-        margin-left: auto;
 
-        margin-right: 24px;
 
-		text-align: right;
 
-		display: flex;
 
-		// flex-direction: column;
 
-		justify-content: space-between;
 
-		align-items: center;
 
-	}
 
+.tui-msg-right {
 
+  max-width: 120upx;
 
+  height: 80upx;
 
+  margin-left: auto;
 
+  margin-right: 24px;
 
+  text-align: right;
 
+  display: flex;
 
+  // flex-direction: column;
 
+  justify-content: space-between;
 
+  align-items: center;
 
+}
 
 </style>

+ 1 - 1
store/src/admin/official/pay.vue
Просмотреть файл 

@@ -2,7 +2,7 @@
 
   <div class="app-content">
 
     <div class="banner-wrap">
 
       <div class="banner-img">
 
-        <img :src="`${constant.imgUrl}/retail/official/pay-banner.png`" alt />
 
+        <img :src="`${constant.imgUrl}/retail/official/pay-banner.png`" mode="widthFix" />
 
         <div class="meal-det">
 
           <div class="meal-title">{{ detail.name }}</div>
 
           <div class="meal-introduce">{{ detail.introduce }}</div>

+ 3 - 3
store/src/admin/order/detail.vue
Просмотреть файл 

@@ -2,7 +2,7 @@
 
   <div class="app-content">
 
     <div class="page-top">
 
       <div class="page-top-img">
 
-        <img :src="`${constant.imgUrl}/retail/order/bg.png`" alt />
 
+        <img :src="`${constant.imgUrl}/retail/order/bg.png`" mode="widthFix" />
 
       </div>
 
       <div class="page-top-det">
 
         <div>
 
@@ -10,7 +10,7 @@
 
           <!-- <div class="page-prompt">请尽快支付哟~</div> -->
 
         </div>
 
         <div class="page-status-img">
 
-          <img :src="data.status == 0 ? waitPayImg : waitDeliveryImg" alt />
 
+          <img :src="data.status == 0 ? waitPayImg : waitDeliveryImg" mode="widthFix" />
 
         </div>
 
       </div>
 
     </div>
 
@@ -131,7 +131,7 @@
 
       <div class="flex-center">
 
         <span v-if="data.status == 0">应付款</span>
 
         <span v-else-if="data.status == 6">已退款</span>
 
-        <span else="data.status == 5">已付款</span>
 
+        <span v-else>已付款</span>
 
         <span class="app-price">
 
           <span>￥</span>
 
           <span class="app-size-40">{{ data.prePrice }}</span>

+ 1 - 0
store/src/components/module/app-vip.vue
Просмотреть файл 

@@ -46,6 +46,7 @@ export default {
 
     transform: scale(0.9);
 
     transform: translate(-50%,0);
 
     // font-size: 16px;
 
+    font-size:25rpx;
 
   }
 
 }
 
 </style>

Некоторые файлы не были показаны из-за большого количества измененных файлов