Merge branch 'master' of http://192.168.1.26:3000/dianliang/dl_uniapp

config.js

@@ -2,7 +2,7 @@
 module.exports = {
 	// baseUrl: 'https://www.ddtg.site/noticeApi',
 	// baseUrl: 'https://www.ddtg.site/noticeApi',
-	baseUrl: 'http://192.168.1.17:8099',
+	baseUrl: 'http://192.168.1.4:8099',
 	// 应用信息
 	appInfo: {
 		// 应用名称

pages/mine/coupon/coupon-list.vue

@@ -23,10 +23,10 @@
 				</view>
 			</view>
 			<view class="item-field" style="align-items: center;">
-				<view class="my-suggest-dom" @click="viewRichText()">
+<!--				<view class="my-suggest-dom" @click="viewRichText()">-->
-					<text>了解通告券</text>
+<!--					<text>了解通告券</text>-->
-					<uni-icons type="right" color="#363636" size="14"></uni-icons>
+<!--					<uni-icons type="right" color="#363636" size="14"></uni-icons>-->
-				</view>
+<!--				</view>-->
 				<view class="my-suggest-dom" @click="goMyCoupon(1)">
 					<text>购买记录</text>
 					<uni-icons type="right" color="#363636" size="14"></uni-icons>

pages/mine/mine-index.vue

@@ -21,6 +21,7 @@
 					<view class="title-box">
 						{{userInfo.nickName || ''}}
 						<image v-if="ifHasCard" src="@/static/mine/huang.png" mode="aspectFit"></image>
+            <view style="font-size: 20rpx;">{{userInfo.cardName||''}}</view>
 					</view>
 					<view class="bottom-box">
 						<view class="fans-box">
@@ -228,15 +229,20 @@
 				memberEndDate: "",
 			}
 		},
-		onShow() {},
+    mounted() {
+      if (null != getJSONData(constant.userInfo)) {
+        this.userInfo = getJSONData(constant.userInfo)
+        this.getDetail()
+      }
+    },
+		onShow() {
+      if (null != getJSONData(constant.userInfo)) {
+        this.userInfo = getJSONData(constant.userInfo)
+        this.getDetail()
+      }
+    },
 		onLoad() {
 
-		},
-		mounted() {
-			if (null != getJSONData(constant.userInfo)) {
-				this.userInfo = getJSONData(constant.userInfo)
-				this.getDetail()
-			}
 		},
 		computed: {
 			windowHeight() {
@@ -256,6 +262,11 @@
 				}
 			},
 			getDetail() {
+        let param = {
+          userId: this.userInfo.userId,
+          userType: this.localUserType
+        }
+        console.log(param,'param')
 				queryDetail({
 					userId: this.userInfo.userId,
 					userType: this.localUserType
@@ -267,12 +278,15 @@
 					this.userInfo.coupon = res.data.coupon.toString()
 					this.userInfo.addNotice = res.data.addNotice.toString()
 					this.userInfo.avatar = this.imageUrl + res.data.avatar
+					this.userInfo.cardName = res.data.cardName
 					if (res.data.memberEndDate && null != res.data.memberEndDate) {
 						this.ifHasCard = true
 						this.memberEndDate = res.data.memberEndDate
 					} else {
 						this.ifHasCard = false
 					}
+					console.log(this.userInfo,'THIS.USERINFO')
+          this.$forceUpdate()
 				})
 			},
 			/**