1

# Conflicts:
#	pages/mine/coupon/my-coupon.vue

api/business/member.js

@@ -193,3 +193,11 @@ export function saveBlack(data) {
 		data: data
 	})
 }
+
+//查询通告券
+export function getMemberCoupon() {
+	return request({
+		url: '/member/coupon/getMemberCoupon',
+		method: 'get',
+	})
+}

config.js

@@ -1,8 +1,8 @@
 // 应用全局配置
 module.exports = {
 	//baseUrl: 'https://notice.lighting-it.cn',
-	baseUrl: 'https://www.ddtg.site/noticeApi',
+	// baseUrl: 'https://www.ddtg.site/noticeApi',
-	//baseUrl: 'http://192.168.1.31:8099',
+	baseUrl: 'http://192.168.1.4:8099',
 	// 应用信息
 	appInfo: {
 		// 应用名称

pages/mine/coupon/coupon-list.vue

@@ -38,6 +38,7 @@
 
 <script>
 	import navigationBarVue from '@/components/navigation/navigationBar.vue';
+  import {getMemberCoupon} from '@/api/business/member.js'
 	export default {
 		components: {
 			navigationBarVue
@@ -49,9 +50,16 @@
 			}
 		},
     onLoad(options){
-		  this.coupon = options.coupon
+    },
+    onShow(){
+      this.initMyCoupon()
     },
 		methods: {
+      initMyCoupon(){
+        getMemberCoupon().then(res=>{
+          this.coupon = res.data
+        })
+      },
 			viewRichText() {
 				this.$tab.navigateTo(
 					`/pages/common/richview/index?title=${this.globalConfig.appInfo.agreements[5].title}&code=${this.globalConfig.appInfo.agreements[5].code}`

pages/mine/coupon/my-coupon.vue

@@ -82,7 +82,8 @@
 	import {
 		saveOrder,
 		getOrderList,
-		prepayment
+		prepayment,
+    getMemberCoupon
 	} from '@/api/business/member.js'
 	import {
 		toast
@@ -127,7 +128,6 @@
 		},
 		onLoad(option) {
 			this.menuIndex = option.index || 0
-			this.coupon = option.coupon || 0
 			this.initCoupon();
 			this.initOrder()
 			//获取url中的search
@@ -143,9 +143,10 @@
 					let that = this
 					getWebAccessTokenAndOpenid(result.code).then(res => {
 						that.$store.dispatch('GzhLogin', res).then(() => {
-							this.initCoupon();
+              that.initCoupon();
-							this.initOrder()
+              that.initOrder()
 							that.loginSuccess()
+              that.initMyCoupon()
 						}).catch((e) => {
 							uni.showToast({
 								icon: 'error',
@@ -159,7 +160,17 @@
 				}
 			}
 		},
+    onShow(){
+		  if (getToken()){
+        this.initMyCoupon()
+      }
+    },
 		methods: {
+      initMyCoupon(){
+        getMemberCoupon().then(res=>{
+          this.coupon = res.data
+        })
+      },
 			openVip() {
 				// 在你想触发跳转的地方
 				wx.openOfficialAccountProfile({

pages/mine/mine-index.vue

@@ -15,7 +15,6 @@
 					<image v-if="!userInfo.avatar" class="touxiang" src="@/static/images/profile.jpg" mode="aspectFit">
 					</image>
 					<image v-else class="touxiang" :src="userInfo.avatar" mode="aspectFit"></image>
-					<image class="sex" src="@/static/mine/sex_girl.png" mode="aspectFit"></image>
 				</view>
 				<view class="name-box">
 					<view class="title-box">