Merge branch 'master' of http://222.85.201.140:10002/xuyunhui/chain_jje_uniapp

.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/shoppingTemplate.iml" filepath="$PROJECT_DIR$/.idea/shoppingTemplate.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/chain_jje_uniapp.iml" filepath="$PROJECT_DIR$/.idea/chain_jje_uniapp.iml" />
     </modules>
   </component>
-</project>
+</project>

pages.json

@@ -27,8 +27,7 @@
 		{
 			"path": "pages/qrCode/index",
 			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"navigationStyle": "custom"
 			}
 
 		},

pages/qrCode/index.rpx.css

@@ -5,3 +5,41 @@
     position: fixed;
     bottom: 0;
 }
+.content{
+    width: 750rpx;
+    padding: 0 25rpx;
+    background: #F7F7F7;
+
+}
+.outView{
+    width: 700rpx;
+    background: #FFFFFF;
+    border-radius: 15rpx;
+    position: relative;
+    top: 250rpx;
+}
+.member-head-img{
+    height: 200rpx;
+    position: absolute;
+    top: -90rpx;
+    left: 250rpx;
+}
+.imageLogo{
+    width: 200rpx;
+    height: 200rpx;
+}
+.member-content{
+    margin-top: 140rpx;
+}
+.user-name{
+    font-size: 40rpx;
+    font-weight: 600;
+}
+.qrcodeImage{
+    width: 480rpx;
+    height: 480rpx;
+}
+.qrcode-desc{
+    font-size: 28rpx;
+    padding-bottom: 25rpx;
+}

pages/qrCode/index.vue

@@ -1,6 +1,33 @@
 <template>
-	<view class="content">
-		二维码
+	<view class="page">
+
+		<view class="content" :style="{'height':height}">
+			<view class="outView flex-col">
+				<view class="member-head-img flex-row justify-center">
+					<image class="imageLogo" v-if="userInfo.selfPhotoUrl" :src="userInfo.selfPhotoUrl" mode=""></image> <!-- 用户头像 -->
+					<image class="imageLogo" v-else src="../../static/logo.png" mode=""></image> <!-- 用户头像 -->
+				</view>
+				<view class="member-content flex-col">
+					<view class="user-name flex-row justify-center">
+						<text>hi.亲爱的{{userInfo.ncikName}}</text>
+					</view> <!-- 用户名 -->
+					<view @click="perfectUserInfo()"  class="flex-row justify-center">
+						<text>你前资料尚不完善,</text>
+						<text>立即完善</text>
+					</view>
+					<view class="qrcode flex-row justify-center">
+						<image class="qrcodeImage bord" v-if="userInfo.qrCodeImg" :src="userInfo.qrCodeImg" mode=""></image> <!-- 二维码图片 -->
+						<image class="qrcodeImage bord" v-else src="../../static/index/u41.png" mode=""></image> <!-- 二维码图片 -->
+					</view>
+					<view class="qrcode-desc flex-row justify-center">
+						<text>会员码，分享邀请好友加入</text>
+					</view>
+				</view>
+			</view>
+
+
+		</view>
+
 		<view class="tabBarLineHeight"></view>
 		<view class="tabBarView">
 			<tab-bar :tabIndex="tabIndex"></tab-bar>
@@ -16,15 +43,43 @@
 		},
 		data() {
 			return {
-				title: 'Hello',
-				tabIndex:2
+				height: '',
+				tabIndex:2,
+				userInfo:''
 			}
 		},
 		onLoad() {
+			let sysInfo = uni.getSystemInfoSync()
+			this.height = sysInfo.screenHeight - (sysInfo.screenWidth/750)*138 + 'px'
+		},
+
+		mounted() {
+
+			// 用户信息
+			this.userInfo = this.$store.state.loginUserInfo;
+			this.getImgUrlByOssId(this.userInfo.selfPhoto, 1)
+			this.getImgUrlByOssId(this.userInfo.wxQrCode, 2)
 
 		},
+
 		methods: {
 
+			getImgUrlByOssId(ossId, type) {
+				let url =  this.$getImgUrlByOssId(ossId);
+				if (type == 1) {
+					this.userInfo.selfPhotoUrl = url;
+				} else if (type == 2) {
+					this.userInfo.qrCodeImg = url;
+				}
+				return url;
+			},
+
+			/* 用户信息 */
+			perfectUserInfo() {
+				uni.navigateTo({
+					url: '/pages/me/user-info',
+				})
+			},
 		}
 	}
 </script>