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

mall/src/pages.json

@@ -147,8 +147,7 @@
 				{
 					"path": "level",
 					"style": {
-						"navigationBarTitleText": "会员等级",
-						"enablePullDownRefresh": true
+						"navigationBarTitleText": "会员等级"
 					}
 				}
 			]

mall/src/pages/home/components/goods-list-big.vue

@@ -19,12 +19,13 @@
 				})">
 					<div 
 						class="goods-img">
-						<app-img
-							class="goods-item_box"
-							:src="item.smallImgList[0]" 
-							 mode="aspectFit" 
-							 style="width:100%"
-							 />
+
+				<image 
+					class="app-img" 
+					:src="item.imgList[0]" 
+					mode="aspectFit" 
+					style="height:713rpx;" ></image>
+
 					</div>
 					<div class="goods-det">
 						<div class="goods-left">
@@ -91,7 +92,8 @@ export default {
 				margin-top: 0;
 			}
 			.goods-img {
-				height:404px;
+				width: 713rpx;
+				height: 713rpx;
 				display: flex;
 				justify-content: center;
 				align-items: center;

mall/src/pages/home/components/goods-list-small.vue

@@ -87,8 +87,8 @@ export default {
 				margin-top: 0;
 			}
 			.goods-img {
-				width: 346px;
-				height: 346px;
+				width: 343px;
+				height: 343px;
 				img {
 					height: 100%;
 				}

mall/src/pages/home/components/login-popup.vue

@@ -56,7 +56,7 @@
               <div class="wx-text-wrap">
                 <div class="app-color-2">请搜索公众号</div>
                 <div class="app-color-1">{{ merchantInfo.wxAliasName }}</div>
-                <div class="app-color-2">关注即升级为会员</div>
+                <div class="app-color-2">关注即获得<span style="color:red;">优惠券</span></div>
               </div>
               <button class="button-com red big" @click="copyFn">复制</button>
             </div>

mall/src/pages/home/shop.vue

@@ -1,165 +1,215 @@
 <template>
-	<div class="app-main app-content">
-		<app-swiper :list="ad" @detail="adDetailFn" />
-		<div class="shop-wrap">
-			<div class="shop-tit">{{ shop.merchantName }}</div>
-			<div>{{ shop.introduction }}</div>
-		</div>
-		<div class="list-content">
-			<tui-list-view class="tui-list-view">
-				<tui-list-cell :lineLeft="false" :lineRight="false" padding="26rpx 30rpx 26rpx 0" class="tui-list">
-					<div class="list-wrap">
-						<div class="list-label">营业时间</div>
-						<div class="list-val">{{ shop.openTime || '暂无' }}</div>
-					</div>
-				</tui-list-cell>
-				<tui-list-cell @click="phoneCall" :lineLeft="false" :lineRight="false" padding="26rpx 30rpx 26rpx 0" class="tui-list">
-					<div class="list-wrap">
-						<div class="list-label">联系电话</div>
-						<div class="list-val">{{ shop.telephone || '暂无' }}</div>
-					</div>
-					<div class="list-icon">
-						<i class="iconfont iconditu" style="font-size:36rpx;"></i>
-					</div>
-				</tui-list-cell>
-				<tui-list-cell @click="goNavBtn" :lineLeft="false" :lineRight="false" padding="26rpx 30rpx 26rpx 0" class="tui-list">
-					<div class="list-wrap">
-						<div class="list-label">门店地址</div>
-						<div class="list-val">{{ shop.fullAddress || '暂无' }}</div>
-					</div>
-					<div class="list-icon">
-						<i class="iconfont icondianhua" style="font-size:36rpx;"></i>
-					</div>
-				</tui-list-cell>
-			</tui-list-view>
-		</div>
-		<!-- <app-footer :activeIndex="2" /> -->
-		<app-activily-coupon :show.sync="activeCoupon" :info="newUserGift" :introUserId="option.introUserId" />
-	</div>
+  <div class="app-main app-content">
+    <app-swiper :list="ad" @detail="adDetailFn" />
+    <div class="shop-wrap">
+      <div class="shop-tit">{{ shop.merchantName }}</div>
+      <div>{{ shop.introduction }}</div>
+    </div>
+    <div class="list-content">
+      <tui-list-view class="tui-list-view">
+        <tui-list-cell
+          :lineLeft="false"
+          :lineRight="false"
+          padding="26rpx 30rpx 26rpx 0"
+          class="tui-list"
+        >
+          <div class="list-wrap">
+            <div class="list-label">营业时间</div>
+            <div class="list-val">{{ shop.openTime || '暂无' }}</div>
+          </div>
+        </tui-list-cell>
+        <tui-list-cell
+          @click="phoneCall"
+          :lineLeft="false"
+          :lineRight="false"
+          padding="26rpx 30rpx 26rpx 0"
+          class="tui-list"
+        >
+          <div class="list-wrap">
+            <div class="list-label">联系电话</div>
+            <div class="list-val">{{ shop.telephone || '暂无' }}</div>
+          </div>
+          <div class="list-icon">
+            <i class="iconfont iconditu" style="font-size:36rpx;"></i>
+          </div>
+        </tui-list-cell>
+        <tui-list-cell
+          @click="goNavBtn"
+          :lineLeft="false"
+          :lineRight="false"
+          padding="26rpx 30rpx 26rpx 0"
+          class="tui-list"
+        >
+          <div class="list-wrap">
+            <div class="list-label">门店地址</div>
+            <div class="list-val">{{ shop.fullAddress || '暂无' }}</div>
+          </div>
+          <div class="list-icon">
+            <i class="iconfont icondianhua" style="font-size:36rpx;"></i>
+          </div>
+        </tui-list-cell>
+      </tui-list-view>
+    </div>
+    <!-- <app-footer :activeIndex="2" /> -->
+    <app-activily-coupon
+      :show.sync="activeCoupon"
+      :info="newUserGift"
+      :introUserId="option.introUserId"
+    />
+  </div>
 </template>
 
 <script>
 // import AppFooter from '@/components/app-footer'
-import TuiListView from '@/components/plugin/list-view'
-import TuiListCell from '@/components/plugin/list-cell'
-import AppSwiper from '@/components/app-swiper'
-import AppActivilyCoupon from '@/components/module/app-activily-coupon'
-// api
-import { getShop } from '@/api/common'
+import TuiListView from "@/components/plugin/list-view";
+import TuiListCell from "@/components/plugin/list-cell";
+import AppSwiper from "@/components/app-swiper";
+import AppActivilyCoupon from "@/components/module/app-activily-coupon";
+import { getShopUser } from "@/utils/auth";
+import { getShop } from "@/api/common";
+import { share } from "@/mixins";
 export default {
-	name: 'category',
-	components: {
-		// AppFooter,
-		AppSwiper,
-		TuiListView,
-		TuiListCell,
-		AppActivilyCoupon
-	},
-	data() {
-		return {
-			data: {},
-			ad: [],
-			shop: {},
-			// 新人领券
-			newUserGift: {},
-			activeCoupon: false
-		}
-	},
-	onLoad(option) {
-		// this.init()
-	},
-	methods: {
-		init() {
-			this._detail()
-		},
-		_detail() {
-			let form = {}
-			if (this.option.introUserId) {
-				form.introUserId = this.option.introUserId
-			}
-			getShop(form).then(res => {
-				this.data = res.data
-				if (this.$util.isEmpty(res.data)) return false
-				this.ad = res.data.ad.map(e => {
-					e.img = e.adImgUrl
-					return e
-				})
-				this.shop = res.data.shop
-				if (!this.$util.isEmpty(res.data.newUserGift)) {
-					this.newUserGift = res.data.newUserGift
-					this.activeCoupon = true
-				}
-			})
-		},
-		// operate
-		adDetailFn(item) {
-			// #ifdef H5
-			location.href = item.url
-			// #endif
-			// #ifndef H5
-			// #endif
-		},
-		phoneCall() {
-			uni.makePhoneCall({
-				phoneNumber: this.shop.telephone
-			})
-		},
-		goNavBtn() {
-			if (!this.shop.shopLat || !this.shop.shopLong) {
-				this.$msg('暂无地址!')
-				return false
-			}
-			uni.openLocation({
-				latitude: parseFloat(this.shop.shopLat),
-				longitude: parseFloat(this.shop.shopLong),
-				name: this.shop.shopCity || '',
-				address: this.shop.shopFullAddress || ''
-			})
-		}
-	}
-}
+  name: "category",
+  components: {
+    // AppFooter,
+    AppSwiper,
+    TuiListView,
+    TuiListCell,
+    AppActivilyCoupon
+  },
+  mixins: [share],
+  data() {
+    return {
+      data: {},
+      ad: [],
+      shop: {},
+      // 新人领券
+      newUserGift: {},
+      activeCoupon: false
+    };
+  },
+  onLoad(option) {
+    // this.init()
+  },
+  methods: {
+    init() {
+      this._detail();
+
+      // #ifdef H5
+      // 微信二次分享
+      let href = window.location.href;
+      if (href.indexOf("from=singlemessage") > 0) {
+        location.href = `${
+          this.$constant.formal
+        }/#/pages/home/shop${this.$util.parse(this.option)}`;
+        return false;
+      }
+      // #endif
+
+      getShopUser().then(res => {
+        // 设置分享
+        let shareParams = {
+          title: `${res.merchantName}`, // 分享标题
+          desc: "这家店不错推荐给你", // 分享内容
+          imgUrl: "",
+          // #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);
+      });
+    },
+    _detail() {
+      let form = {};
+      if (this.option.introUserId) {
+        form.introUserId = this.option.introUserId;
+      }
+      getShop(form).then(res => {
+        this.data = res.data;
+        if (this.$util.isEmpty(res.data)) return false;
+        this.ad = res.data.ad.map(e => {
+          e.img = e.adImgUrl;
+          return e;
+        });
+        this.shop = res.data.shop;
+        if (!this.$util.isEmpty(res.data.newUserGift)) {
+          this.newUserGift = res.data.newUserGift;
+          this.activeCoupon = true;
+        }
+      });
+    },
+    // operate
+    adDetailFn(item) {
+      // #ifdef H5
+      location.href = item.url;
+      // #endif
+      // #ifndef H5
+      // #endif
+    },
+    phoneCall() {
+      uni.makePhoneCall({
+        phoneNumber: this.shop.telephone
+      });
+    },
+    goNavBtn() {
+      if (!this.shop.shopLat || !this.shop.shopLong) {
+        this.$msg("暂无地址!");
+        return false;
+      }
+      uni.openLocation({
+        latitude: parseFloat(this.shop.shopLat),
+        longitude: parseFloat(this.shop.shopLong),
+        name: this.shop.shopCity || "",
+        address: this.shop.shopFullAddress || ""
+      });
+    }
+  }
+};
 </script>
 
 <style lang="scss" scoped>
-	.shop-wrap {
-		padding: 40px 20px;
-		color: $fontColor3;
-		background-color: #fff;
-		margin-bottom: 20px;
-		.shop-tit {
-			font-size: 38px;
-			color: #333;
-			font-weight: 600;
-			margin-bottom: 20px;
-		}
-	}
-	.list-content {
-		background-color: #fff;
-		.tui-list {
-			width: calc(100% - 20px);
-			@include disFlex(center, space-between);
-			// padding-left: 0 !important;
-			margin-left: 20px;
-			.list-wrap {
-				width: calc(100% - 40px);
-				@include disFlex(center, flex-start);
-				color: $fontColor3;
-				.list-label {
-					width: 150px;
-					color: #333;
-					// margin-right: 40px;
-				}
-				.list-val {
-					width: calc(100% - 150px);
-				}
-			}
-			.list-icon {
-				margin-right: 10px;
-				.iconfont {
-					color: $mainColor;
-					font-weight: bold;
-				}
-			}
-		}
-	}
+.shop-wrap {
+  padding: 40px 20px;
+  color: $fontColor3;
+  background-color: #fff;
+  margin-bottom: 20px;
+  .shop-tit {
+    font-size: 38px;
+    color: #333;
+    font-weight: 600;
+    margin-bottom: 20px;
+  }
+}
+.list-content {
+  background-color: #fff;
+  .tui-list {
+    width: calc(100% - 20px);
+    @include disFlex(center, space-between);
+    // padding-left: 0 !important;
+    margin-left: 20px;
+    .list-wrap {
+      width: calc(100% - 40px);
+      @include disFlex(center, flex-start);
+      color: $fontColor3;
+      .list-label {
+        width: 150px;
+        color: #333;
+        // margin-right: 40px;
+      }
+      .list-val {
+        width: calc(100% - 150px);
+      }
+    }
+    .list-icon {
+      margin-right: 10px;
+      .iconfont {
+        color: $mainColor;
+        font-weight: bold;
+      }
+    }
+  }
+}
 </style>

mall/src/pages/interest/level.vue

@@ -1,158 +1,163 @@
 <template>
-	<div class="app-content">
-		<div class="rank-top-wrap">
-			<div class="rank-top-text">
-				<div class="rank-top-tit">VIP会员权益</div>
-				<div>升级会员享受更多权益~</div>
-			</div>
-			<div class="rank-top-img">
-				<img :src="`${constant.imgUrl}/retail/interest/VIP-interest.png`" alt mode="widthFix" />
-			</div>
-		</div>
-		<!--  -->
-		<div class="rank-bottom-wrap">
-			<div class="rank-text">
-				<div>1、充值或消费1元得1积分</div>
-				<div>2、会员权益享受折扣：</div>
-			</div>
-			<!-- level -->
-			<div class="level-list-wrap">
-				<div class="level-list-tit">
-					<div>会员等级</div>
-					<div>成长值</div>
-					<div>折扣</div>
-				</div>
-				<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/member/grade/${item.level}.png`" />
-						</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 class="app-content">
+    <div class="rank-top-wrap">
+      <div class="rank-top-text">
+        <div class="rank-top-tit">VIP会员权益</div>
+        <div>升级会员享受更多权益~</div>
+      </div>
+      <div class="rank-top-img">
+        <img :src="`${constant.imgUrl}/retail/interest/VIP-interest.png`" alt mode="widthFix" />
+      </div>
+    </div>
+    <!--  -->
+    <div class="rank-bottom-wrap">
+      <div class="rank-text">
+        <div>1、充值或消费1元得1积分</div>
+        <div>2、会员权益享受折扣：</div>
+      </div>
+      <!-- level -->
+      <div class="level-list-wrap">
+        <div class="level-list-tit">
+          <div>会员等级</div>
+          <div>成长值</div>
+          <div>折扣</div>
+        </div>
+        <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/member/grade/${item.level}.png`"
+              />
             </div>
-		</div>
-        <app-trademark-module />
-	</div>
+            <div>{{ item.growth }}</div>
+            <div>{{ item.discount }}</div>
+          </div>
+        </div>
+      </div>
+      <!-- #ifdef H5 -->
+      <div class="btn-wrap">
+        <div class="button-com red big" @click="pageTo('/pages/user/register')">申请成为会员</div>
+      </div>
+      <!-- #endif -->
+    </div>
+    <app-trademark-module />
+  </div>
 </template>
 
 <script>
-import AppVipModule from '@/components/module/app-vip'
-import AppTrademarkModule from '@/components/module/app-trademark'
+import AppVipModule from "@/components/module/app-vip";
+import AppTrademarkModule from "@/components/module/app-trademark";
 // api
-import { userGrade } from '@/api/member'
+import { userGrade } from "@/api/member";
 export default {
-	name: 'interest-rank',
-	components: {
-		AppVipModule,
-		AppTrademarkModule
-	},
-	data() {
-		return {
-			constant: this.$constant,
-			list: []
-		}
-	},
-	onLoad() {
-		// this.init()
-	},
-	methods: {
-		init() {
-			this._getDet()
-		},
-		_getDet() {
-			userGrade().then(res => {
-				this.list = res.data
-			})
-		}
-	}
-}
+  name: "interest-rank",
+  components: {
+    AppVipModule,
+    AppTrademarkModule
+  },
+  data() {
+    return {
+      constant: this.$constant,
+      list: []
+    };
+  },
+  onLoad() {
+    // this.init()
+  },
+  methods: {
+    init() {
+      this._getDet();
+    },
+    _getDet() {
+      userGrade().then(res => {
+        this.list = res.data;
+      });
+    }
+  }
+};
 </script>
 
 <style lang="scss" scoped>
-	.rank-top-wrap {
-		width: 100%;
-		height: 230px;
-		position: relative;
-		background-color: #191919;
-		.rank-top-text {
-			color: #d2d2d2;
-			padding-top: 60px;
-			padding-left: 70px;
-			.rank-top-tit {
-				color: #ffd515;
-				font-size: 44px;
-				margin-bottom: 10px;
-			}
-		}
-		.rank-top-img {
-			position: absolute;
-			top: 20px;
-			right: 44px;
-			width: 232px;
-		}
-	}
-	// ----
-	.rank-bottom-wrap {
-		padding: 30px;
-		background-color: #fff;
-		.rank-text {
-			margin-bottom: 26px;
-			& > div {
-				margin-bottom: 16px;
-			}
-        }
-        .btn-wrap {
-            width: calc(100% - 60px);
-            margin-top: 50px;
-            .button-com {
-                width: 100%;
-            }
+.rank-top-wrap {
+  width: 100%;
+  height: 230px;
+  position: relative;
+  background-color: #191919;
+  .rank-top-text {
+    color: #d2d2d2;
+    padding-top: 60px;
+    padding-left: 70px;
+    .rank-top-tit {
+      color: #ffd515;
+      font-size: 44px;
+      margin-bottom: 10px;
+    }
+  }
+  .rank-top-img {
+    position: absolute;
+    top: 20px;
+    right: 44px;
+    width: 232px;
+  }
+}
+// ----
+.rank-bottom-wrap {
+  padding: 30px;
+  background-color: #fff;
+  .rank-text {
+    margin-bottom: 26px;
+    & > div {
+      margin-bottom: 16px;
+    }
+  }
+  .btn-wrap {
+    width: calc(100% - 60px);
+    margin-top: 50px;
+    .button-com {
+      width: 100%;
+    }
+  }
+  .level-list-wrap {
+    border: 1px solid #eeeeee;
+    font-size: 26px;
+    .level-list-tit,
+    .level-list {
+      @include disFlex(center, space-between);
+      & > div {
+        margin: 0 auto;
+        flex: 1;
+        @include disFlex(center, center);
+        height: 70px;
+      }
+      .level-img {
+        /deep/.vip-text {
+          left: 42px;
+          transform: scale(0.8);
         }
-		.level-list-wrap {
-            border: 1px solid #EEEEEE;
-            font-size: 26px;
-			.level-list-tit,
-			.level-list {
-				@include disFlex(center, space-between);
-				& > div {
-					margin: 0 auto;
-					flex: 1;
-					@include disFlex(center, center);
-					height: 70px;
-				}
-				.level-img {
-					/deep/.vip-text {
-						left: 42px;
-						transform: scale(0.8);
-					}
-				}
-			}
-			.level-list-tit {
-				color: #fff;
-				background-color: #d9c096;
-				& > div {
-					border-left: 1px solid #fff;
-				}
-				& > div:first-child {
-					border-left: none;
-				}
-			}
-			.level-list {
-				&:nth-child(2n) {
-					background-color: #f7f7ed;
-				}
-				& > div {
-					border-left: 1px solid #EEEEEE;
-				}
-				& > div:first-child {
-					border-left: none;
-				}
-			}
-		}
-	}
+      }
+    }
+    .level-list-tit {
+      color: #fff;
+      background-color: #d9c096;
+      & > div {
+        border-left: 1px solid #fff;
+      }
+      & > div:first-child {
+        border-left: none;
+      }
+    }
+    .level-list {
+      &:nth-child(2n) {
+        background-color: #f7f7ed;
+      }
+      & > div {
+        border-left: 1px solid #eeeeee;
+      }
+      & > div:first-child {
+        border-left: none;
+      }
+    }
+  }
+}
 </style>

saas/dist/saas/index.html

@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href=/css/app.6f07e55a.css rel=preload as=style><link href=/css/chunk-libs.14efb97a.css rel=preload as=style><link href=/js/app.347b4ad6.js rel=preload as=script><link href=/js/chunk-libs.6cdd4aee.js rel=preload as=script><link href=/css/chunk-libs.14efb97a.css rel=stylesheet><link href=/css/app.6f07e55a.css rel=stylesheet></head><body><noscript></noscript><div id=app><div class=once><div class=container><div class=title>正在加载资源</div><div class=sub-title>初次加载资源可能需要较多时间 请耐心等待</div></div><div class=footer><a href=https://www.baidu.com/ target=_blank>花卉宝</a></div></div></div><script src=/cdn/vue/2.6.10/vue.min.js></script><script src=/cdn/vue-router/3.1.3/vue-router.min.js></script><script src=/cdn/vuex/3.1.1/vuex.min.js></script><script src=/cdn/clipboard.js/2.0.4/clipboard.min.js></script><script src=/cdn/axios/0.19.0-beta.1/axios.min.js></script><script src=/cdn/nprogress/0.2.0/nprogress.min.js></script><script src=/cdn/Mock.js/1.0.1-beta3/mock-min.js></script><script src=/cdn/quill/2.0.0-dev.3/quill.min.js></script><script src=/cdn/element-ui/2.13.0/index.js></script><script src=/cdn/viewerjs/1.3.7/viewer.min.js></script><script src=/cdn/echarts/4.4.0-rc.1/echarts.min.js></script><script src=/cdn/npm/vue-echarts@4.0.2.js></script><script src=/js/chunk-libs.6cdd4aee.js></script><script src=/js/app.347b4ad6.js></script></body></html>
+			}</style><link href=/css/app.6f07e55a.css rel=preload as=style><link href=/css/chunk-libs.14efb97a.css rel=preload as=style><link href=/js/app.50ca3d4c.js rel=preload as=script><link href=/js/chunk-libs.6cdd4aee.js rel=preload as=script><link href=/css/chunk-libs.14efb97a.css rel=stylesheet><link href=/css/app.6f07e55a.css rel=stylesheet></head><body><noscript></noscript><div id=app><div class=once><div class=container><div class=title>正在加载资源</div><div class=sub-title>初次加载资源可能需要较多时间 请耐心等待</div></div><div class=footer><a href=https://www.baidu.com/ target=_blank>花卉宝</a></div></div></div><script src=/cdn/vue/2.6.10/vue.min.js></script><script src=/cdn/vue-router/3.1.3/vue-router.min.js></script><script src=/cdn/vuex/3.1.1/vuex.min.js></script><script src=/cdn/clipboard.js/2.0.4/clipboard.min.js></script><script src=/cdn/axios/0.19.0-beta.1/axios.min.js></script><script src=/cdn/nprogress/0.2.0/nprogress.min.js></script><script src=/cdn/Mock.js/1.0.1-beta3/mock-min.js></script><script src=/cdn/quill/2.0.0-dev.3/quill.min.js></script><script src=/cdn/element-ui/2.13.0/index.js></script><script src=/cdn/viewerjs/1.3.7/viewer.min.js></script><script src=/cdn/echarts/4.4.0-rc.1/echarts.min.js></script><script src=/cdn/npm/vue-echarts@4.0.2.js></script><script src=/js/chunk-libs.6cdd4aee.js></script><script src=/js/app.50ca3d4c.js></script></body></html>

saas/src/mock/userInfo.js

@@ -186,7 +186,7 @@ let menu = {
 		{
 			id: '1',
 			parentId: null,
-			name: '商家管理',
+			name: '商家',
 			type: 0,
 			icon: 'icongongzuotai',
 			orderNum: 1,
@@ -249,11 +249,11 @@ let menu = {
 			viewPath: 'saas/shop/buy',
 			keepAlive: 1
 		},
-		// 订单管理
+		// 订单
 		{
 			id: '2',
 			parentId: null,
-			name: '商家订单',
+			name: '订单',
 			type: 1,
 			icon: 'icongongzuotai',
 			orderNum: 2,
@@ -261,11 +261,11 @@ let menu = {
 			viewPath: 'saas/order/list',
 			keepAlive: 1
 		},
-		// 商家客户
+		// 客户
 		{
 			id: '3',
 			parentId: null,
-			name: '商家客户',
+			name: '客户',
 			type: 1,
 			icon: 'icongongzuotai',
 			orderNum: 3,
@@ -273,11 +273,10 @@ let menu = {
 			viewPath: 'saas/member/list',
 			keepAlive: 1
 		},
-		// 平台客户
 		{
 			id: '4',
 			parentId: null,
-			name: '店长管理',
+			name: '店长',
 			type: 1,
 			icon: 'icongongzuotai',
 			orderNum: 4,
@@ -285,11 +284,10 @@ let menu = {
 			viewPath: 'saas/pt-member/list',
 			keepAlive: 1
 		},
-		// 商家商品
 		{
 			id: '5',
 			parentId: null,
-			name: '商品管理',
+			name: '商品',
 			type: 1,
 			icon: 'icongongzuotai',
 			orderNum: 5,
@@ -297,11 +295,10 @@ let menu = {
 			viewPath: 'saas/goods/list',
 			keepAlive: 1
 		},
-		// 节日管理
 		{
 			id: '6',
 			parentId: null,
-			name: '节日管理',
+			name: '节日',
 			type: 1,
 			icon: 'icongongzuotai',
 			orderNum: 6,
@@ -309,11 +306,10 @@ let menu = {
 			viewPath: 'saas/fest/list',
 			keepAlive: 1
 		},
-		// 套餐管理
 		{
 			id: '7',
 			parentId: null,
-			name: '套餐管理',
+			name: '套餐',
 			type: 0,
 			icon: 'icongongzuotai',
 			orderNum: 7,
@@ -335,7 +331,7 @@ let menu = {
 		{
 			id: '701',
 			parentId: '7',
-			name: '权限管理',
+			name: '权限',
 			type: 1,
 			icon: 'icongongzuotai',
 			orderNum: 7,

shop/dist/shop/css/chunk-0a1caa4c.c3dcb4e0.css

@@ -0,0 +1 @@
+.el-dialog .el-dialog__header[data-v-6d1b3046]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-6d1b3046]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-6d1b3046]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-6d1b3046]{font-size:18px}.el-dialog .el-dialog__body[data-v-6d1b3046]{padding:20px}.el-dialog .el-dialog__footer[data-v-6d1b3046]{padding-bottom:15px}.cl-upload[data-v-6d1b3046]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.cl-upload .upload-wrap[data-v-6d1b3046]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:120px;width:120px;cursor:pointer;border:1px dashed #d9d9d9;border-radius:6px;margin-right:10px;position:relative}.cl-upload .upload-wrap .el-icon-plus[data-v-6d1b3046]{font-size:28px;color:#8c939d}.cl-upload .upload-wrap .el-icon-close[data-v-6d1b3046]{position:absolute;right:5px;top:5px;color:red;background-color:#f56c6c;color:#fff;border-radius:100%;padding:2px}.cl-upload .upload-wrap .el-icon-close[data-v-6d1b3046]:hover{background-color:red}.cl-upload .upload-wrap img[data-v-6d1b3046]{height:100%;width:100%;border-radius:6px}.cl-upload .upload-wrap[data-v-6d1b3046]:hover{border:1px dashed #409eff}

shop/dist/shop/css/chunk-19f2480e.ff456027.css

@@ -1 +0,0 @@
-.el-dialog .el-dialog__header[data-v-9f18be26]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-9f18be26]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-9f18be26]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-9f18be26]{font-size:18px}.el-dialog .el-dialog__body[data-v-9f18be26]{padding:20px}.el-dialog .el-dialog__footer[data-v-9f18be26]{padding-bottom:15px}.shop-list[data-v-9f18be26]{height:100%}

shop/dist/shop/css/chunk-53af45ee.7642ec55.css

@@ -0,0 +1 @@
+.el-dialog .el-dialog__header[data-v-2f5b6738]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-2f5b6738]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-2f5b6738]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-2f5b6738]{font-size:18px}.el-dialog .el-dialog__body[data-v-2f5b6738]{padding:20px}.el-dialog .el-dialog__footer[data-v-2f5b6738]{padding-bottom:15px}.shop-list[data-v-2f5b6738]{height:100%}

shop/dist/shop/css/chunk-e9b6939a.733a4aa7.css

@@ -1 +0,0 @@
-.el-dialog .el-dialog__header[data-v-4acd1cdb]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-4acd1cdb]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-4acd1cdb]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-4acd1cdb]{font-size:18px}.el-dialog .el-dialog__body[data-v-4acd1cdb]{padding:20px}.el-dialog .el-dialog__footer[data-v-4acd1cdb]{padding-bottom:15px}.cl-upload[data-v-4acd1cdb]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.cl-upload .upload-wrap[data-v-4acd1cdb]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:120px;width:120px;cursor:pointer;border:1px dashed #d9d9d9;border-radius:6px;margin-right:10px;position:relative}.cl-upload .upload-wrap .el-icon-plus[data-v-4acd1cdb]{font-size:28px;color:#8c939d}.cl-upload .upload-wrap .el-icon-close[data-v-4acd1cdb]{position:absolute;right:5px;top:5px;color:red;background-color:#f56c6c;color:#fff;border-radius:100%;padding:2px}.cl-upload .upload-wrap .el-icon-close[data-v-4acd1cdb]:hover{background-color:red}.cl-upload .upload-wrap img[data-v-4acd1cdb]{height:100%;width:100%;border-radius:6px}.cl-upload .upload-wrap[data-v-4acd1cdb]:hover{border:1px dashed #409eff}

shop/dist/shop/index.html

@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href=/css/app.6f07e55a.css rel=preload as=style><link href=/css/chunk-libs.14efb97a.css rel=preload as=style><link href=/js/app.3af60a22.js rel=preload as=script><link href=/js/chunk-libs.6cdd4aee.js rel=preload as=script><link href=/css/chunk-libs.14efb97a.css rel=stylesheet><link href=/css/app.6f07e55a.css rel=stylesheet></head><body><noscript></noscript><div id=app><div class=once><div class=container><div class=title>正在加载资源</div><div class=sub-title>初次加载资源可能需要较多时间 请耐心等待</div></div><div class=footer><a href=https://www.baidu.com/ target=_blank>花卉宝</a></div></div></div><script src=/cdn/vue/2.6.10/vue.min.js></script><script src=/cdn/vue-router/3.1.3/vue-router.min.js></script><script src=/cdn/vuex/3.1.1/vuex.min.js></script><script src=/cdn/clipboard.js/2.0.4/clipboard.min.js></script><script src=/cdn/axios/0.19.0-beta.1/axios.min.js></script><script src=/cdn/nprogress/0.2.0/nprogress.min.js></script><script src=/cdn/Mock.js/1.0.1-beta3/mock-min.js></script><script src=/cdn/quill/2.0.0-dev.3/quill.min.js></script><script src=/cdn/element-ui/2.13.0/index.js></script><script src=/cdn/viewerjs/1.3.7/viewer.min.js></script><script src=/cdn/echarts/4.4.0-rc.1/echarts.min.js></script><script src=/cdn/npm/vue-echarts@4.0.2.js></script><script src=/js/chunk-libs.6cdd4aee.js></script><script src=/js/app.3af60a22.js></script></body></html>
+			}</style><link href=/css/app.6f07e55a.css rel=preload as=style><link href=/css/chunk-libs.14efb97a.css rel=preload as=style><link href=/js/app.fd4c2b3b.js rel=preload as=script><link href=/js/chunk-libs.6cdd4aee.js rel=preload as=script><link href=/css/chunk-libs.14efb97a.css rel=stylesheet><link href=/css/app.6f07e55a.css rel=stylesheet></head><body><noscript></noscript><div id=app><div class=once><div class=container><div class=title>正在加载资源</div><div class=sub-title>初次加载资源可能需要较多时间 请耐心等待</div></div><div class=footer><a href=https://www.baidu.com/ target=_blank>花卉宝</a></div></div></div><script src=/cdn/vue/2.6.10/vue.min.js></script><script src=/cdn/vue-router/3.1.3/vue-router.min.js></script><script src=/cdn/vuex/3.1.1/vuex.min.js></script><script src=/cdn/clipboard.js/2.0.4/clipboard.min.js></script><script src=/cdn/axios/0.19.0-beta.1/axios.min.js></script><script src=/cdn/nprogress/0.2.0/nprogress.min.js></script><script src=/cdn/Mock.js/1.0.1-beta3/mock-min.js></script><script src=/cdn/quill/2.0.0-dev.3/quill.min.js></script><script src=/cdn/element-ui/2.13.0/index.js></script><script src=/cdn/viewerjs/1.3.7/viewer.min.js></script><script src=/cdn/echarts/4.4.0-rc.1/echarts.min.js></script><script src=/cdn/npm/vue-echarts@4.0.2.js></script><script src=/js/chunk-libs.6cdd4aee.js></script><script src=/js/app.fd4c2b3b.js></script></body></html>

shop/dist/shop/js/chunk-346511ea.f27ef75c.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-346511ea"],{"1e29":function(a,t,e){"use strict";e.r(t);var s=function(){var a=this,t=a.$createElement,e=a._self._c||t;return e("div",{staticClass:"card-name-module"},[e("div",{staticClass:"member-avatar"},[e("cl-avatar",{style:{margin:"auto"},attrs:{size:60,src:a._f("default_avatar")(a.data.avatarUrl)}})],1),e("div",{staticClass:"source-wrap"},[e("span",{staticClass:"member-name"},[a._v(a._s(a.data.userName))])])])},c=[],n={name:"card-name",props:{data:{type:Object,default:function(){}}}},r=n,d=(e("dac6"),e("e90a")),i=Object(d["a"])(r,s,c,!1,null,"c6464d9e",null);t["default"]=i.exports},"7ccd":function(a,t,e){},dac6:function(a,t,e){"use strict";var s=e("7ccd"),c=e.n(s);c.a}}]);

shop/dist/shop/js/chunk-3d6a58c1.e56dd686.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-3d6a58c1"],{"1e29":function(a,s,t){"use strict";t.r(s);var i=function(){var a=this,s=a.$createElement,t=a._self._c||s;return t("div",{staticClass:"card-name-module"},[t("div",{staticClass:"member-avatar"},[t("cl-avatar",{style:{margin:"auto"},attrs:{size:60,src:a._f("default_avatar")(a.data.avatarUrl)}})],1),t("div",{staticClass:"source-wrap"},[t("span",{staticClass:"member-name"},[a._v(a._s(a.data.userName))]),0==a.data.source?t("i",{staticClass:"iconfont iconweixinlaiyuan"}):a._e(),1==a.data.source?t("i",{staticClass:"iconfont iconzhifubao"}):a._e(),t("i",{staticClass:"iconfont iconweixingongzhonghao",class:[a.data.subscribe?"app-color-4":""]}),a.data.mobile?t("i",{staticClass:"iconfont iconshoujihao1"}):a._e()]),t("div",{staticClass:"label-wrap"},[t("div",{staticClass:"label-list app-color-0"},[t("span",[a._v("最近到店：")]),t("span",[a._v(a._s(a.data.visitTimeFormat))])]),t("div",{staticClass:"label-list"},[t("span",[a._v("累计消费：")]),t("span",[a._v("￥"+a._s(a.data.totalExpend||0))])]),t("div",{staticClass:"label-list"},[t("span",[a._v("帐户余额：")]),t("span",[a._v("￥"+a._s(a.data.balance||0))])]),t("div",{staticClass:"label-list"},[t("span",[a._v("累计积分：")]),t("span",[a._v(a._s(a.data.integral||0))])])])])},n=[],c={name:"card-name",props:{data:{type:Object,default:function(){}}}},e=c,l=(t("37b1"),t("e90a")),o=Object(l["a"])(e,i,n,!1,null,"5590a07c",null);s["default"]=o.exports},"2c1f":function(a,s,t){},"37b1":function(a,s,t){"use strict";var i=t("2c1f"),n=t.n(i);n.a}}]);

shop/src/cool/utils/index.js

@@ -8,7 +8,7 @@ export const getFirstHost = () => {
 		return 'huaml';
 	}
 	if(process.env.NODE_ENV == 'local'){
-		return 'hhb';
+		return 'huaml';
 	}
 	return host;
 };

shop/src/service/shop/index.js

@@ -5,6 +5,7 @@ import store from '@/store';
 @Service('shop')
 export class LevelService extends BaseService {
 	downloadGatheringCode(id) {
+		console.log('baseUrl',baseUrl);
 		return baseUrl + `/shop/gathering-code?id=${id}&token=${store.state.user.token}`;
 	}
 

shop/src/views/member/components/card-name.vue

@@ -1,39 +1,10 @@
 <template>
 	<div class="card-name-module">
 		<div class="member-avatar">
-			<cl-avatar
-				:size="60"
-				:src="data.avatarUrl | default_avatar"
-				:style="{ margin: 'auto' }"
-			></cl-avatar>
+			<cl-avatar :size="60" :src="data.avatarUrl | default_avatar" :style="{ margin: 'auto' }"></cl-avatar>
 		</div>
 		<div class="source-wrap">
 			<span class="member-name">{{ data.userName }}</span>
-			<i v-if="data.source == 0" class="iconfont iconweixinlaiyuan"></i>
-			<i v-if="data.source == 1" class="iconfont iconzhifubao"></i>
-			<i
-				class="iconfont iconweixingongzhonghao"
-				:class="[data.subscribe ? 'app-color-4' : '']"
-			></i>
-			<i v-if="data.mobile" class="iconfont iconshoujihao1"></i>
-		</div>
-		<div class="label-wrap">
-			<div class="label-list app-color-0">
-				<span>最近到店：</span>
-				<span>{{ data.visitTimeFormat }}</span>
-			</div>
-			<div class="label-list">
-				<span>累计消费：</span>
-				<span>￥{{ data.totalExpend || 0 }}</span>
-			</div>
-			<div class="label-list">
-				<span>帐户余额：</span>
-				<span>￥{{ data.balance || 0 }}</span>
-			</div>
-			<div class="label-list">
-				<span>累计积分：</span>
-				<span>{{ data.integral || 0 }}</span>
-			</div>
 		</div>
 	</div>
 </template>

shop/src/views/member/components/detail-draw.vue

@@ -79,7 +79,6 @@
 			<el-table :data="orderData">
 				<el-table-column property="id" label="ID"></el-table-column>
 				<el-table-column property="createTime" label="提交时间"></el-table-column>
-				<el-table-column property="orderName" label="订单名称"></el-table-column>
 				<el-table-column property="actPrice" label="订单金额"></el-table-column>
 				<el-table-column property="payWay" label="支付方式"></el-table-column>
 				<el-table-column property="sendNum" label="编号"></el-table-column>

shop/src/views/shop/list.vue

@@ -23,7 +23,6 @@
 
 			<template #slot-top-add>
 				<el-button size="mini" @click="shopAdd">添加门店</el-button>
-				<el-button size="mini" @click="shopPic">门店图片</el-button>
 			</template>
 		</x-crud>
 	</div>
@@ -70,6 +69,8 @@ export default {
 				},
 
 				update: params => {
+					this.$message.error('开发中，请在手机端修改...');
+					return false;
 					return this.$service.shop.update({
 						...params,
 						openTime: params.openTime.join('-')
@@ -398,11 +399,9 @@ export default {
 		},
 
 		shopAdd() {
+			this.$message.error('开发中...');
+			return false;
 			this.crud.add();
-		},
-
-		shopPic() {
-			this.$router.push('/ad/list');
 		}
 	}
 };

shop/vue.config.js

@@ -2,7 +2,7 @@ const path = require('path');
 
 const isProduction = process.env.NODE_ENV === 'production';
 
-const proxyTarget = process.env.NODE_ENV === 'local' ? 'http://api.shop.hhb.com' : 'http://api.shop.huaml.com';
+const proxyTarget = 'https://api.shop.huaml.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);

store/src/admin/adminShop/bind.vue

@@ -19,7 +19,7 @@
           </tui-list-cell>
           <tui-list-cell class="line-cell" :hover="false">
             <div class="tui-title required" style="width:120rpx;">昵称</div>
-            <view style="width:400rpx;">{{form.nickname}}</view>
+            <view style="width:400rpx;">{{form.nickName}}</view>
             <button
               class="admin-button-com blue mini-btn"
               open-type="getUserInfo"
@@ -30,7 +30,7 @@
           <div
             class="prompt-text"
             style="margin-top:20rpx;margin-bottom:20rpx;font-size:30rpx;"
-          >关注公众号，第一时间接收动态提醒：</div>
+          >关注公众号，第一时间接收门店动态：</div>
 
           <tui-list-cell>
             <block>
@@ -82,7 +82,7 @@ export default {
         recommendAdminId: "",
         shopId: "",
         adminId: "",
-        nickname: ""
+        nickName: ""
       },
       levelSelData: {},
       showBindArea:true,
@@ -91,9 +91,7 @@ export default {
   },
   computed: {},
   onLoad(props) {
-    console.log(encodeURIComponent("adminId=18533&shopId=15680"));
     const scene = decodeURIComponent(props.scene);
-    console.log(scene);
     var sceneItem = scene.split("&");
     var arr, name, value;
     var sceneArray = new Array();
@@ -111,8 +109,7 @@ export default {
       generateAdmin(this.form).then(res => {
         this.showBindArea = false
         this.showSuccessArea = true
-        uni.setStorageSync('shopId', res.data.shopId)
-        //this.$msg("添加成功！");
+        uni.clearStorageSync();
       });
     },
     // 表单验证
@@ -142,7 +139,6 @@ export default {
       ];
       // 进行表单检查
       let formData = this.form;
-      console.log(formData);
       let checkRes = form.validation(formData, rules);
       // 验证通过!
       if (!checkRes) {
@@ -153,7 +149,6 @@ export default {
     },
     // 获取微信手机号
     getWxMobile(e) {
-      console.log(e);
       if (e.detail.errMsg === "getPhoneNumber:ok") {
         getWxPhone({
           iv: e.detail.iv,
@@ -173,12 +168,10 @@ export default {
       uni.getUserInfo({
         provider: "weixin",
         success: res => {
-          console.log("res", res);
-          // this.popupShow = true
           getWxInfo({ iv: res.iv, encryptedData: res.encryptedData }).then(
             subRes => {
               this.form.adminId = subRes.data.id;
-              this.form.nickname = subRes.data.nickname;
+              this.form.nickName = subRes.data.nickName;
               uni.showToast({
                 icon: "success"
               });

store/src/admin/home/member.vue

@@ -47,9 +47,6 @@
                 </template>
               </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>

store/src/admin/interest/my-invite.vue

@@ -42,7 +42,6 @@
             <div class="list-det-right">
               <div class="list-name">{{ item.name }}</div>
               <div class="list-detail">
-                <span>{{ item.userName }}</span>
                 <span>{{ item.mobile }}</span>
                 <span class="app-price">￥{{ item.fee }}</span>
               </div>
@@ -129,12 +128,9 @@ export default {
   computed: {
     ...mapGetters({ userInfo: "getUser" })
   },
-  onLoad() {
-
-  },
+  onLoad() {},
   methods: {
     init() {
-
       this._assetDet();
       this._applyList();
 
@@ -142,21 +138,22 @@ export default {
         let params = {
           title: "更懂您的花卉宝",
           desc: "",
-          imgUrl: this.constant.imgUrl+"/retail/official/banner-1.png",
-          pagePath: "admin/official/index?introMerchantId="+res.id
+          imgUrl: this.constant.imgUrl + "/retail/official/banner-1.png",
+          pagePath: "admin/official/index?introMerchantId=" + res.id
         };
         this.jweixinFn(params);
-	  })
-
+      });
     },
     _assetDet() {
       assetDet().then(res => {
-        if (this.$util.isEmpty(res.data)) return false;
+        if (this.$util.isEmpty(res.data)) {
+          return false;
+        }
         this.data = res.data;
-        this.userData[0].value = res.data.balance;
-        this.userData[1].value = res.data.inviteNum;
-        this.userData[2].value = res.data.payNum;
-        this.userData[3].value = res.data.income;
+        this.userData[0].value = res.data.balance | 0.0;
+        this.userData[1].value = res.data.inviteNum | 0;
+        this.userData[2].value = res.data.payNum | 0;
+        this.userData[3].value = res.data.income | 0.0;
       });
     },
     _applyList() {

store/src/admin/member/detail.vue

@@ -18,36 +18,47 @@
             <div class="app-color-3">{{ data.id }}</div>
           </div>
           <div class="source-wrap">
-            <i 
+            <i
               v-if="data.sourceType == 0"
-              :class="[data.sourceType == 0? 'iconweixinlaiyuanColor' : '']" 
-              class="iconfont iconweixinlaiyuan"></i>
-            <i 
+              :class="[data.sourceType == 0? 'iconweixinlaiyuanColor' : '']"
+              class="iconfont iconweixinlaiyuan"
+              style="font-size:42rpx;"
+            ></i>
+            <i
               v-else-if="data.sourceType == 1"
               :class="[data.sourceType == 1? 'zhifubaoColor' : '']"
-              class="iconfont iconzhifubao"></i>
-            <i 
+              class="iconfont iconzhifubao"
+              style="font-size:42rpx;"
+            ></i>
+            <i
               v-else-if="data.sourceType == 2"
               :class="[data.sourceType == 2? 'app-color-4' : '']"
-              class="iconfont iconxiaochengxu1"></i>
-            <i 
+              class="iconfont iconxiaochengxu1"
+              style="font-size:42rpx;"
+            ></i>
+            <i
               v-else-if="data.sourceType == 3"
               :class="[data.sourceType == 3? 'app-color-4' : '']"
-              class="iconfont iconzhangshangcaifuyemianshoujiban344"></i>
-            <i 
+              class="iconfont iconzhangshangcaifuyemianshoujiban344"
+              style="font-size:42rpx;"
+            ></i>
+            <i
               v-else-if="data.sourceType == 4"
-               :class="[data.sourceType == 4? 'app-color-4' : '']"
-              class="iconfont iconwaimai"></i>
-             <i
+              :class="[data.sourceType == 4? 'app-color-4' : '']"
+              class="iconfont iconwaimai"
+              style="font-size:42rpx;"
+            ></i>
+            <i
               v-if="data.sourceType != 1"
               class="iconfont iconweixingongzhonghao"
               :class="[data.subscribe==1? 'app-color-4' : '']"
-            >
-            </i>
-            <i 
+              style="font-size:42rpx;"
+            ></i>
+            <i
               @click="data.mobile&&callUp(data.mobile)"
-              :class="['iconfont', 'iconshoujihao1',data.mobile?'mobileColor':'']"></i>
-            
+              :class="['iconfont', 'iconshoujihao1',data.mobile?'mobileColor':'']"
+              style="font-size:42rpx;"
+            ></i>
           </div>
         </div>
       </div>
@@ -263,19 +274,19 @@ export default {
       // 用户资金情况
       fundsData: [
         {
-          name: "消费次数",
+          name: "成长值",
           value: 0
         },
         {
-          name: "累计消费(¥)",
+          name: "余额",
           value: 0
         },
         {
-          name: "成长值",
+          name: "消费次数",
           value: 0
         },
         {
-          name: "余额",
+          name: "累计消费(¥)",
           value: 0
         }
       ],
@@ -363,19 +374,18 @@ export default {
       orderMoreStatus: false,
       // 确认操作提示
       promptRemarkModal: false,
-	  promptModalText: "是否要删除该备注？"
+      promptModalText: "是否要删除该备注？"
     };
   },
   computed: {
     ...mapGetters({ levelData: "getLevel" })
   },
-  onLoad() {
-  },
+  onLoad() {},
   methods: {
-    callUp(phone){
-          uni.makePhoneCall({
+    callUp(phone) {
+      uni.makePhoneCall({
         phoneNumber: phone //仅为示例
-    });
+      });
     },
     init() {
       this._getUserDet();
@@ -383,14 +393,14 @@ export default {
     },
     _getUserDet() {
       getUserDet({ userId: this.option.id }).then(res => {
-        if (this.$util.isEmpty(res.data)){
-			return false;
-		}
-		this.data = res.data;
-        this.fundsData[0].value = res.data.userAsset.totalBuyNum;
-        this.fundsData[1].value = res.data.userAsset.totalExpend;
-        this.fundsData[2].value = res.data.userAsset.growth;
-        this.fundsData[3].value = res.data.userAsset.balance;
+        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;
       });
     },
     _rechargeB() {
@@ -546,8 +556,8 @@ export default {
           margin-left: 10px;
           width: 80px;
           /deep/.vip-text {
-              left: 70px;
-              top: 3px;
+            left: 70px;
+            top: 3px;
             // top: -2px;
             // left: 26px;
             // font-weight: 400;

store/src/admin/shop/list.vue

@@ -41,8 +41,8 @@
 		</div>
 		<!-- 按钮 -->
 		<div class="app-footer">
-			<div class="admin-button-com middle" @click="pageTo('/admin/ad/list')">门店图片</div>
-			<div class="admin-button-com middle blue" @click="pageTo('/admin/shop/add')">添加门店</div>
+			<!-- <div class="admin-button-com middle blue" @click="pageTo('/admin/shop/add')">添加门店</div> -->
+			<div class="admin-button-com middle blue">添加门店</div>
 		</div>
 		<!-- 删除弹窗 -->
 		<modal-module :show="delModal" @cancel="modalCancel" @click="delModalClick" content="是否要删除该门店" color="#333" :size="32" padding="30rpx 30rpx"></modal-module>

store/src/admin/staff/add.vue

@@ -107,8 +107,8 @@
     <div v-show="showMiniCodeArea">
       <view style="text-align:center;">
           <image style="width:200px;height:200px;margin:0 auto;" :src="miniCodeSrc"></image>
-          <view style="text-align:center;margin-top:20px;margin-bottom:20px;">请扫上方小程序码完成绑定</view>
-          <button class="admin-button-com big blue" @click="complete">完成</button>
+          <view style="text-align:center;margin-top:20px;margin-bottom:20px;">请扫描上方小程序码完成绑定</view>
+          <button class="admin-button-com big blue" @click="complete" style="padding-left:18px;padding-right:18px;">完成</button>
       </view>
     </div>
   </div>