注册会员码

hdApp/src/admin/cg/member.vue

@@ -0,0 +1,110 @@
+<template>
+  <view class="app-content">
+    <view class="img_box">
+      <image :src="imgUrl" class="img_url"></image>
+    </view>
+    <view style="margin:50upx 0 0 30upx;font-size:30upx;">保存图片到手机，可分享或打印张贴</view>
+    <div class="confirm-btn">
+      <button class="admin-button-com big blue" @click="downloadImg">保存图片</button>
+    </div>
+    <!-- #ifdef MP-WEIXIN -->
+    <view style="margin:50upx 0 0 30upx;font-size:30upx;">打开直接分享给客户</view>
+    <div class="confirm-btn1">
+      <button class="admin-button-com big blue" @click="goToMallPt('pages/home/index')">打开商城</button>
+    </div>
+    <!-- #endif -->
+  </view>
+</template>
+<script>
+import { mainGetMallPoster } from '@/api/main/index'
+import { getWeixinId } from "@/api/invite/index";
+import { mapGetters } from "vuex";
+export default {
+  data() {
+    return {
+      imgUrl: '',
+      getappIdList: {}
+    }
+  },
+  computed: {
+    ...mapGetters({ loginInfo: "getLoginInfo" })
+  },
+  methods: {
+    init() {
+      this.getImg()
+      getWeixinId().then(res => {
+        this.getappIdList = res.data
+      });
+    },
+    downloadImg(){
+      uni.downloadFile({
+        url: this.imgUrl,
+        success: (res) => {
+          if (res.statusCode === 200) {
+            console.log(res)
+            uni.saveImageToPhotosAlbum({
+              filePath: res.tempFilePath,
+              success: function (data) {
+                console.log(data)
+                uni.showToast({title:'下载成功!'})
+              }
+            });
+          }
+        }
+      });
+    },
+    getImg() {
+      mainGetMallPoster().then(res => {
+        console.log(res)
+        this.imgUrl = res.data.imgUrl
+      }).catch(err => {})
+    },
+    goToMallPt (url) {
+      let self = this
+      console.log(url + '?account=' + self.loginInfo.shopId)
+        uni.navigateToMiniProgram({
+          appId: this.getappIdList.mall.miniAppId,
+          path: url + '?account=' + self.loginInfo.shopId,
+          //develop 开发版 trial 体验版 release 正式版
+          envVersion: process.env.NODE_ENV === 'development' ? 'develop' : 'release',
+          extraData: {
+            'hdShopAdminId': self.loginInfo.shopAdminId
+          },
+          success (res) {
+          }
+        })
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.app-content{
+  overflow: hidden;
+}
+.img_box{
+  height: 450upx;
+  box-sizing: border-box;
+  &>.img_url{
+    height: 450upx;
+    width: 450upx;
+    margin: 100upx auto;
+  }
+}
+// 按钮
+.confirm-btn {
+  width: calc(100% - 60upx);
+  margin: 30upx 30upx 20upx;
+  .admin-button-com {
+    width: 100%;
+  }
+}
+// 按钮
+.confirm-btn1 {
+  width: calc(100% - 60upx);
+  margin: 30upx 30upx 20upx;
+  .admin-button-com {
+    width: 100%;
+  }
+}
+</style>

hdApp/src/admin/home/workbench.vue

@@ -94,6 +94,7 @@ export default {
       },
       tabsData: [
         { name: "商城", img: `${this.$constant.imgUrl}/ghs/home/shop.png`, url: "/admin/cg/mall",pf:1},
+        { name: "会员码", img: `${this.$constant.imgUrl}/ghs/home/shop.png`, url: "/admin/cg/member",pf:1},
         { name: "制作单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/work/list",pf:1 },
         { name: "改价", img: `${this.$constant.imgUrl}/ghs/home/gj.png`, url: "/admin/changePrice/list",pf:0},
         { name: "花材", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/item/list",pf:1 },
@@ -104,7 +105,6 @@ export default {
         { name: "商品采购单", img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`, url: "/admin/goods/plantCg",pf:1},
         { name: "报损单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/breakage/list",pf:1},
         { name: "员工", img: `${this.$constant.imgUrl}/ghs/home/yggl.png`, url: "/admin/staff/list",pf:0 },
-        { name: "花材分类", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/itemClass/list",pf:1},
       ],
       totalData: [
         { name: "客户数", value: 0 },

hdApp/src/pages.json

@@ -59,7 +59,8 @@
 		{
 			"root": "admin/cg",
 			"pages": [
-				{ "path": "mall", "style": { "navigationBarTitleText": "商城" } }
+				{ "path": "mall", "style": { "navigationBarTitleText": "商城" } },
+				{ "path": "member", "style": { "navigationBarTitleText": "注册会员码" } }
 			]
 		},
 		{

mallApp/src/api/auth/index.js

@@ -0,0 +1,5 @@
+import https from '@/plugins/luch-request_0.0.7/request'
+
+export const wxMobileLogin = data => { 
+	return	https.post("/auth/wx-mobile-login", data) 
+}

mallApp/src/api/user/index.js

@@ -3,3 +3,7 @@ import https from '@/plugins/luch-request_0.0.7/request'
 export const recentShop = data => {
 	return https.get('/user/recent-shop', data)
 }
+
+export const create = data => {
+	return https.post('/user/create', data)
+}

mallApp/src/pages.json

@@ -1,198 +1,82 @@
 {
-    "pages": [{
-            "path": "pages/home/recent",
-            "style": {
-                "navigationBarTitleText": "最新花店"
-            }
-        },
-        {
-            "path": "pages/home/index",
-            "style": {
-                "navigationBarTitleText": "首页"
-            }
-        },
-        {
-            "path": "pages/home/category",
-            "style": {
-                "navigationBarTitleText": "分类"
-            }
-        },
-        {
-            "path": "pages/home/shop",
-            "style": {
-                "navigationBarTitleText": "门店"
-            }
-        },
-        {
-            "path": "pages/home/user",
-            "style": {
-                "navigationBarTitleText": "我的"
-            }
-        },
-        {
-            "path": "pages/home/course",
-            "style": {
-                "navigationBarTitleText": "课程",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/item/item",
-            "style": {
-                "navigationBarTitleText": "鲜花",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "common/redirect",
-            "style": {
-                "navigationBarTitleText": "加载中..."
-            }
-        },
-        {
-            "path": "common/webview",
-            "style": {
-                "navigationBarBackgroundColor": "#ffffff",
-                "navigationBarTextStyle": "black"
-            }
-        },
-        {
-            "path": "pages/class/index",
-            "style": {
-                "navigationBarBackgroundColor": "#ffffff",
-                "navigationBarTextStyle": "black"
-            }
-        },
-        {
-            "path": "pages/class/paySuccess",
-            "style": {
-                "navigationBarBackgroundColor": "#ffffff",
-                "navigationBarTextStyle": "black"
-            }
-        }
+    "pages": [{ "path": "pages/home/recent", "style": { "navigationBarTitleText": "最新花店" } },
+        { "path": "pages/home/index", "style": { "navigationBarTitleText": "首页" } },
+        { "path": "pages/home/category", "style": { "navigationBarTitleText": "分类" } },
+        { "path": "pages/home/shop", "style": { "navigationBarTitleText": "门店" } },
+        { "path": "pages/home/user", "style": { "navigationBarTitleText": "我的" } },
+        { "path": "pages/home/course", "style": { "navigationBarTitleText": "课程", "enablePullDownRefresh": true } },
+        { "path": "pages/item/item", "style": { "navigationBarTitleText": "鲜花", "enablePullDownRefresh": true } },
+        { "path": "common/redirect", "style": { "navigationBarTitleText": "加载中..." } },
+        { "path": "common/webview", "style": { "navigationBarBackgroundColor": "#ffffff", "navigationBarTextStyle": "black" } },
+        { "path": "pages/class/index", "style": { "navigationBarBackgroundColor": "#ffffff", "navigationBarTextStyle": "black" } },
+        { "path": "pages/class/paySuccess", "style": { "navigationBarBackgroundColor": "#ffffff", "navigationBarTextStyle": "black" } }
     ],
     "subPackages": [{
             "root": "pages/user",
-            "pages": [{
-                    "path": "register",
-                    "style": {
-                        "navigationBarTitleText": "注册"
-                    }
-                },
-                {
-                    "path": "password",
-                    "style": {
-                        "navigationBarTitleText": "修改密码"
-                    }
-                }
+            "pages": [
+                { "path": "register", "style": { "navigationBarTitleText": "注册" } },
+                { "path": "password", "style": { "navigationBarTitleText": "修改密码" } }
             ]
         },
         {
             "root": "pages/goods",
-            "pages": [{
-                "path": "detail",
-                "style": {
-                    "navigationBarTitleText": "详情"
-                }
-            }]
+            "pages": [
+                { "path": "detail", "style": { "navigationBarTitleText": "详情" } }
+            ]
+        },
+        {
+            "root": "pages/login",
+            "pages": [
+                { "path": "index", "style": { "navigationBarTitleText": "登录" } },
+                { "path": "result", "style": { "navigationBarTitleText": "登录成功" } }
+            ]
         },
         {
             "root": "pages/pay",
-            "pages": [{
-                "path": "index",
-                "style": {
-                    "navigationBarTitleText": ""
-                }
-            }]
+            "pages": [
+                { "path": "index", "style": { "navigationBarTitleText": "" } }
+            ]
         },
         {
             "root": "pages/callback",
-            "pages": [{
-                    "path": "index"
-                },
-                {
-                    "path": "success",
-                    "style": {
-                        "navigationBarTitleText": "支付成功"
-                    }
-                }
+            "pages": [
+                { "path": "index" },
+                { "path": "success", "style": { "navigationBarTitleText": "支付成功" } }
             ]
         },
         {
             "root": "pages/coupon",
-            "pages": [{
-                "path": "list",
-                "style": {
-                    "navigationBarTitleText": "优惠券",
-                    "enablePullDownRefresh": true
-                }
-            }]
+            "pages": [
+                { "path": "list", "style": { "navigationBarTitleText": "优惠券", "enablePullDownRefresh": true } }
+            ]
         },
         {
             "root": "pages/order",
-            "pages": [{
-                    "path": "list",
-                    "style": {
-                        "navigationBarTitleText": "订单列表",
-                        "enablePullDownRefresh": true
-                    }
-                },
-                {
-                    "path": "detail",
-                    "style": {
-                        "navigationBarTitleText": "订单列表"
-                    }
-                },
-                {
-                    "path": "buy",
-                    "style": {
-                        "navigationBarTitleText": "订单确认"
-                    }
-                },
-                {
-                    "path": "comment",
-                    "style": {
-                        "navigationBarTitleText": "评价"
-                    }
-                }
+            "pages": [
+                { "path": "list", "style": { "navigationBarTitleText": "订单列表", "enablePullDownRefresh": true } },
+                { "path": "detail", "style": { "navigationBarTitleText": "订单列表" } },
+                { "path": "buy", "style": { "navigationBarTitleText": "订单确认" } },
+                { "path": "comment", "style": { "navigationBarTitleText": "评价" } }
             ]
         },
         {
             "root": "pages/interest",
-            "pages": [{
-                    "path": "invite",
-                    "style": {
-                        "navigationBarTitleText": "邀请排行",
-                        "enablePullDownRefresh": true
-                    }
-                },
-                {
-                    "path": "level",
-                    "style": {
-                        "navigationBarTitleText": "会员等级"
-                    }
-                }
+            "pages": [
+                { "path": "invite", "style": { "navigationBarTitleText": "邀请排行", "enablePullDownRefresh": true } },
+                { "path": "level", "style": { "navigationBarTitleText": "会员等级" } }
             ]
         },
         {
             "root": "pages/chat",
-            "pages": [{
-                "path": "index",
-                "style": {
-                    "navigationBarTitleText": "客服",
-                    "enablePullDownRefresh": true
-                }
-            }]
+            "pages": [
+                { "path": "index", "style": { "navigationBarTitleText": "客服", "enablePullDownRefresh": true } }
+            ]
         },
         {
             "root": "pages/billing",
-            "pages": [{
-                "path": "affirmGhs",
-                "style": {
-                    "navigationBarTitleText": "订单结算",
-                    "enablePullDownRefresh": true
-                }
-            }]
+            "pages": [
+                { "path": "affirmGhs", "style": { "navigationBarTitleText": "订单结算", "enablePullDownRefresh": true } }
+            ]
         }
     ],
     "globalStyle": {

mallApp/src/pages/home/user.vue

@@ -5,12 +5,12 @@
         <view class="is-login-attr">
           <view class="user-wrap-top">
             <view class="user-blo-left">
-              <view class="user-name-warp" v-if="!$util.isEmpty(shopUser)"> <view class="user-name">{{shopUser.name||'游客'}}</view> </view>
-              <view class="user-name-warp" v-else> <view class="user-name">注册/登录</view> </view>
-              <view class="user-level"><view>ID {{shopUser.id||'0000'}}</view></view>
+              <view class="user-name-warp" v-if="!$util.isEmpty(loginInfo)"> <view class="user-name">{{loginInfo.name||'游客'}}</view> </view>
+              <view class="user-name-warp" @click="pageTo({url:'/pages/login/index'})" v-else> <view class="user-name">注册/登录</view> </view>
+              <view class="user-level"><view>ID {{loginInfo.id||'0000'}}</view></view>
             </view>
             <view class="user-blo-right login-attr-wrap">
-              <image :src="shopUser.avatar||`${constant.imgUrl}/retail/user/attr-default.png`" mode="widthFix"></image>
+              <image :src="`${constant.imgUrl}/default-img.png`" mode="widthFix"></image>
             </view>
           </view>
         </view>
@@ -20,7 +20,7 @@
       <view class="surplus-wrap">
         <view class="surplus-left">
           <view>余额（¥）</view>
-          <view class="my-surplus">{{shopUser.balance||0}}</view>
+          <view class="my-surplus">0</view>
         </view>
       </view>
     </template>
@@ -73,9 +73,9 @@ export default {
       currentTabIndex: 4
     };
   },
-  computed: {
-    ...mapGetters({ shopUser: "getShopUser" })
-  },
+	computed: {
+		...mapGetters({loginInfo:"getLoginInfo"})
+	},
   onLoad(option) {
   },
   methods: {

mallApp/src/pages/login/index.vue

@@ -1,135 +1,137 @@
 <template>
-	<view class="content">
-		<view class="top">
-			<text class="top-title">管理系统</text>
-		</view>
-		<form>
-			<view class="uni-form-item uni-column">
-				<view class="title">账号</view>
-				<input class="uni-input" name="input" placeholder="请输入您的账号" v-model="username" />
-			</view>
-			<view class="uni-form-item uni-column">
-				<view class="title">密码</view>
-				<input class="uni-input" name="input" type="password" placeholder="请输入您的密码" v-model="password" />
-			</view>
-			<view class="uni-btn-v">
-				<button class="active" @click="login()" v-if="!showstate">登录</button>
-				<button type="default" class="unactive" v-if="showstate">登录</button>
-			</view>
-		</form>
-	</view>
+  <view class="app-content">
+    <view>
+      <form @submit="formSubmit">
+        <view class="module-com input-line-wrap">
+          <view class="prompt-text" style="padding-top:20upx;margin-bottom:20upx;font-size:30upx;" >按以下操作进行登录：</view>
+          <tui-list-cell class="line-cell" :hover="false">
+            <view class="tui-title" style="width:120upx;">手机号</view>
+            <view style="width:400upx;">{{form.mobile}}</view>
+            <button class="admin-button-com blue middle" style="border:none;" open-type="getPhoneNumber" @getphonenumber="getWxMobile" >帮我填</button>
+          </tui-list-cell>
+          <tui-list-cell class="line-cell" :hover="false">
+            <view class="tui-title" style="width:120upx;">昵称</view>
+            <view style="width:400upx;">{{form.name}}</view>
+            <button class="admin-button-com blue middle" style="border:none;" @click="getWxAvatar" >帮我填</button>
+          </tui-list-cell>
+          <view class="btn-wrap">
+            <button class="admin-button-com blue big" style="border:none;" formType="submit">确认</button>
+          </view>
+        </view>
+      </form>
+    </view>
+  </view>
 </template>
 <script>
-import { sendlogin } from '@/api/login'
+import TuiListCell from "@/components/plugin/list-cell"
+const form = require("@/utils/formValidation.js")
+import { getWxInfo, getWxPhone } from "@/api/mini"
+import { create } from "@/api/user"
+import store from '@/store'
 export default {
-	name: 'index',
-	data() {
-		return {
-			username: '',
-			password: '',
-			showstate: true
-		}
-	},
-	computed: {},
-	onLoad(option) {},
-	onShow() {},
-	onPageScroll: function(e) {},
-	mounted() {},
-	watch: {
-		username(newVal, oldVal) {
-			if (newVal == 0 || this.password == 0 || newVal == '') {
-				this.showstate = true
-			} else {
-				this.showstate = false
-			}
-		},
-		password(newVal, oldVal) {
-			if (newVal !== '' && this.username !== '') {
-				this.showstate = false
-			} else {
-				this.showstate = true
-			}
-		}
+  name: "index",
+  components: {
+    TuiListCell
+  },
+  data() {
+    return {
+      form: {
+        mobile: "",
+        name: ""
+      }
+    };
+  },
+  methods: {
+	init(){
+
 	},
-	methods: {
-		change(e) {
-			if ((this.username == '') & (this.pssworld == '')) {
-				this.showstate = true
-			} else {
-				this.showstate = false
-			}
-		},
-		msg(msg) {
-			uni.showToast({
-				title: msg,
-				icon: 'none'
-			})
-		},
-		login() {
-			uni.showLoading({
-				title: '登录中...',
-				mask: true
-			})
-			if (this.username == '' || this.pssworld == '') {
-				this.showstate = true
-			} else {
-				this.showstate = false
-				let data = {
-					username: this.username,
-					password: this.password
+    confirmFn() {
+		let currentMiniOpenId = uni.getStorageSync('miniOpenId')
+		let that = this
+		create({miniOpenId:currentMiniOpenId,...this.form}).then(res => {
+			if(res.code == 1){
+				if(res.data.info && !that.$util.isEmpty(res.data.info)){
+					store.commit('setLoginInfo', res.data.info)
+					that.$util.pageTo({url: "/pages/login/result",type:2})
 				}
-				sendlogin(data)
-					.then(res => {
-					})
-					.catch(() => {
-						this.msg('账号或密码不正确！')
-					})
 			}
-		}
-	}
-}
-</script>
+		})
+    },
+    formSubmit(e) {
+      let rules = [
+        {
+          name: "mobile",
+          rule: ["required"],
+          msg: ["请填写手机号"]
+        },
+        {
+          name: "name",
+          rule: ["required"],
+          msg: ["请填写昵称"]
+        }
+      ]
+      let formData = this.form;
+      let checkRes = form.validation(formData, rules);
+      if (!checkRes) {
+        this.confirmFn();
+      } else {
+        this.$msg(checkRes);
+      }
+    },
+    getWxMobile(e) {
+      if (e.detail.errMsg === "getPhoneNumber:ok") {
+		let currentMiniOpenId = uni.getStorageSync('miniOpenId')
+        getWxPhone({ iv: e.detail.iv, encryptedData: e.detail.encryptedData,miniOpenId:currentMiniOpenId }).then(subRes => {
 
-<style scoped lang="scss">
-	.content {
-		width: 100%;
-		height: 100%;
-		.top {
-			height: 282upx;
-			background: url('../../static/images/bg.png');
-			background-size: cover;
-			.top-title {
-				line-height: 282upx;
-				font-size: 50upx;
-				color: #040404;
-				padding-left: 5%;
-			}
-		}
-		.uni-form-item {
-			width: 90%;
-			margin-left: 5%;
-			margin-bottom: 30upx;
-			border-bottom: 2upx solid #bbbbbb;
-			.title {
-				padding: 0;
-				margin-bottom: 20upx;
+			if(subRes.data && subRes.data.hasNoOpenId && subRes.data.hasNoOpenId == 1){
+				uni.showModal({
+					title: '提示',
+					content: '网络异常，请重试一次',
+					success: function (res) {
+						if (res.confirm) {
+							console.log('用户点击确定')
+						}
+					}
+				})
+				return false
 			}
-			.uni-input {
-				margin-bottom: 10upx;
-			}
-		}
-		.uni-btn-v {
-			width: 90%;
-			margin-left: 5%;
-			font-size: 32upx;
-			.active {
-				color: white;
-				background: #2878ff;
-			}
-			.unactive {
-				color: white;
-				background: #bdbec0;
+
+			this.form.mobile = subRes.data.mobile
+			uni.showToast({ title:'获取成功',icon: "success" })
+        })
+      } else {
+        this.$msg("获取手机失败");
+      }
+    },
+    getWxAvatar() {
+		let currentMiniOpenId = uni.getStorageSync('miniOpenId')
+		uni.getUserProfile({
+			desc:'登录',
+			success:(res)=>{
+				getWxInfo({ iv: res.iv, encryptedData: res.encryptedData,miniOpenId:currentMiniOpenId }).then( subRes => {
+
+						if(subRes.data && subRes.data.hasNoOpenId && subRes.data.hasNoOpenId == 1){
+							uni.showModal({
+								title: '提示',
+								content: '网络异常，请重试一次',
+								success: function (res) {
+									if (res.confirm) {
+										console.log('用户点击确定')
+									}
+								}
+							})
+							return false
+						}
+						this.form.name = subRes.data.nickName
+						uni.showToast({ title:'获取成功', icon: "success" })
+
+					}
+				)
 			}
-		}
-	}
-</style>
+		})
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+</style>

mallApp/src/pages/login/result.vue

@@ -0,0 +1,139 @@
+<template>
+  <view class="app-content">
+    <view class="callback-wrap">
+      <view class="callback-blo">
+        <view style="margin-bottom:50upx;">点击按钮打开二维码，识别添加店长微信</view>
+        
+        <button class="button-com red" style="width:220upx;" @click="nextFn">打开二维码</button>
+
+        <view style="margin-top:50upx;">
+          <button class="button-com default" style="width:220upx;" @click="nextFn">返回</button>
+        </view>
+
+      </view>
+    </view>
+  </view>
+</template>
+<script>
+export default {
+  name: "result",
+  components: {},
+  data() {
+    return {
+      constant: this.$constant,
+    }
+  },
+  methods: {
+    init() {
+
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.app-content {
+  .callback-wrap {
+    padding-top: 50upx;
+    background-image: url("../../static/images/callback/bg.png");
+    background-repeat: no-repeat;
+    background-size: 100% auto;
+    .callback-blo {
+      width: 90%;
+      margin: 0 auto;
+      padding: 100upx 0;
+      background-color: #fff;
+      box-shadow: 2upx 2upx 16upx 0upx rgba(181, 181, 181, 0.29);
+      border-radius: 10upx;
+      text-align: center;
+      .icon {
+        .iconfont {
+          font-size: 170upx;
+        }
+      }
+      .status-img {
+        width: 294upx;
+        margin: 0 auto;
+      }
+      .call-btn-com {
+        margin-top: 56upx;
+        @include disFlex(center, space-evenly);
+      }
+      .call-one-btn {
+        .button-com {
+          width: 80%;
+          padding-top: 22upx;
+          padding-bottom: 22upx;
+          font-size: 32upx;
+          margin-top: 40upx;
+        }
+      }
+      .call-two-btn {
+        .button-com {
+          width: 40%;
+          padding-top: 22upx;
+          padding-bottom: 22upx;
+          font-size: 32upx;
+        }
+        .default {
+          margin-right: 20upx;
+        }
+      }
+    }
+    .coupon-wrap {
+      width: 96%;
+      margin: 52upx auto 0;
+      position: relative;
+      .qrcode-img {
+        width: 170upx;
+        height: 170upx;
+        position: absolute;
+        top: 40upx;
+        right: 108upx;
+      }
+    }
+  }
+}
+.awaitPayWx,
+.awaitPayYe {
+  .status-text {
+    margin-top: 22upx;
+    margin-bottom: 52upx;
+    color: #ffa92e;
+  }
+  .surplus {
+    margin-top: 22upx;
+    margin-bottom: 38upx;
+  }
+  .icon {
+    .iconfont {
+      color: #ffa92e;
+    }
+  }
+}
+.registerMember,
+.successPay,
+.successPayCode,
+.successEval {
+  .status-text {
+    color: #333;
+    margin-top: 22upx;
+    margin-bottom: 52upx;
+  }
+}
+.registerMember {
+  .call-back-wrap {
+    .qr-code-img {
+      width: 300upx;
+      height: 300upx;
+      margin: 20upx auto;
+      img {
+        height: 100%;
+      }
+    }
+    .app-color-2 {
+      font-size: 30upx;
+      margin-bottom: 20upx;
+    }
+  }
+}
+</style>

mallApp/src/store/modules/login.js

@@ -12,10 +12,4 @@ export default {
 			state.loginInfo = payload
 		}
 	}
-	// ,
-	// actions: {
-	// 	setLoginInfo ({ commit }, payload) {
-	// 		commit('setLoginInfo', payload)
-	// 	}
-	// }
 }

mallApp/src/utils/auth.js

@@ -1,6 +1,4 @@
 import store from '@/store'
-// import { share } from '@/mixins'
-import CONSTANT from '@/constant'
 import UTIL from '@/utils/util'
 import { getStaffApi, getUserApi } from '@/api/common'
 import { postWxCode } from '@/api/mini'
@@ -77,10 +75,10 @@ export async function wxLoginFn(update) {
 
 			uni.setStorageSync('token', subRes.data.token)
 			uni.setStorageSync('miniOpenId', subRes.data.miniOpenId)
-			store.commit('setLoginInfo', subRes.data.user)
 
-			//更新用户数据
-			//store.dispatch('setShopUser', userInfo)
+			if(subRes.data.user && !$util.isEmpty(subRes.data.user)){
+				store.commit('setLoginInfo', subRes.data.user)
+			}
 
 			//启动更新逻辑 shish 2020.5.18
 			if (subRes.data.update == 1) {