Merge branch 'master' of http://47.109.85.120:3000/jiandexin/saber_weixin into dev1.0

pages/goods/goods_list_mall/index.vue

@@ -222,6 +222,14 @@ export default {
 				that.loading = false;
 				that.loadTitle = loadend ? that.$t(`没有更多内容啦~`) : that.$t(`加载更多`);
 				that.$set(that, 'productList', productList);
+				if (that.where.zoneType == 8 && that.productList.length == 1){
+					uni.showLoading({ title: '跳转共富1580中' });
+					setTimeout(() => {
+						// 自动跳转共富1580商品详情
+						that.godDetail(that.productList[0])
+					}, 1500);
+					
+				}
 				that.$set(that.where, 'current', that.where.current + 1);
 				if (!that.productList.length) this.get_host_product();
 			}).catch(err => {

pages/users/user_invoice_list/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view :style="colorStyle">
-		<view class="acea-row nav">
+		<view class="acea-row nav" v-show="(nav !== 3)">
 			<view class="acea-row row-center-wrapper" :class="{ on: nav === 1 }" @click="navTab(1)">{{ $t(`消费商`) }}
 			</view>
 			<view class="acea-row row-center-wrapper" :class="{ on: nav === 2 }" @click="navTab(2)">{{ $t(`绑定记录`) }}
@@ -35,8 +35,8 @@
 				</u-grid>
 				<view class="imageUrl">
 					<view class="imageUrlin" v-if="url">
-						<ayQrcode ref="qrcode" qrcode_id="qrcode" :modal="modal_qr" :url="url"
-							@hideQrcode="hideQrcode" :height="200" :width="200"/>
+						<ayQrcode ref="qrcode" qrcode_id="qrcode" :modal="modal_qr" :url="url" @hideQrcode="hideQrcode"
+							:height="qr_height" :width="qr_width" />
 						<!-- <u--image src="https://cdn.uviewui.com/uview/album/1.jpg" height="200px" width="100%"
 							:showLoading="true">
 							<view slot="error" style="font-size: 24rpx;">加载失败</view>
@@ -48,9 +48,22 @@
 				<image :src="imgHost + '/statics/images/noInvoice.png'"></image>
 				<view>{{ $t(`没有消费商信息哟~`) }}</view>
 			</view> -->
-			<navigator class="add-link" :url="`/pages/users/user_invoice_form/index?specialInvoice=${specialInvoice}`">
+			<navigator class="add-link" :url="`/pages/goods/goods_list_mall/index?zoneType=8&title=共富1580`">
 				{{ $t(`邀请用户立即参与`) }}</navigator>
 		</view>
+		<view v-show="(nav === 3)">
+			<view class="list-nav3">
+				<u-empty
+						mode="permission"
+						text="您还未参与共富1580"
+						icon="http://cdn.uviewui.com/uview/empty/permission.png"
+						:height="600"
+				>
+				</u-empty>
+			</view>
+			<navigator class="add-link" :url="`/pages/goods/goods_list_mall/index?zoneType=8&title=共富1580`">
+				{{ $t(`立即参与`) }}</navigator>
+		</view>
 		<!-- #ifndef MP -->
 		<home></home>
 		<!-- #endif -->
@@ -127,7 +140,9 @@ export default {
 			limit: 300,
 			loading: false,
 			finished: false,
-			specialInvoice: true
+			specialInvoice: true,
+			qr_height: 200,
+			qr_width: 200
 		};
 	},
 	watch: {
@@ -154,11 +169,12 @@ export default {
 		if (option.from === 'invoice_form') {
 			this.nav = 2;
 		}
-		// uni.getSystemInfo({
-		// 	success: function (res) {
-		// 		// that.urlWidth = res.windowWidth
-		// 	},
-		// });
+		uni.getSystemInfo({
+			success: function (res) {
+				that.qr_width = res.windowWidth * 0.4
+				that.qr_height = res.windowWidth * 0.4
+			},
+		});
 		this.getStatistics();
 	},
 	methods: {
@@ -192,18 +208,22 @@ export default {
 				userId: this.$store.state.app.uid
 			}
 			).then(res => {
-				this.list[0].count = res.data.earningsCount || 0
-				this.list[1].count = res.data.todayEarnings || 0
-				this.list[2].count = res.data.oneCount || 0
-				this.list[3].count = res.data.twoCount || 0
-				this.list[4].count = res.data.sort || 0
-				this.list[5].count = res.data.outSort || 0
-				this.specialInvoice = true
-				if (res.data.sheraUrl){
-					this.url = res.data.sheraUrl
-					this.showQrcode()
-				}
 				uni.hideLoading();
+				if (res.data.isPartner == -1) {
+					this.nav = 3
+				} else {
+					this.list[0].count = res.data.earningsCount || 0
+					this.list[1].count = res.data.todayEarnings || 0
+					this.list[2].count = res.data.oneCount || 0
+					this.list[3].count = res.data.twoCount || 0
+					this.list[4].count = res.data.sort || 0
+					this.list[5].count = res.data.outSort || 0
+					this.specialInvoice = true
+					if (res.data.sheraUrl) {
+						this.url = res.data.sheraUrl
+						this.showQrcode()
+					}
+				}
 			});
 
 		},
@@ -299,14 +319,14 @@ export default {
 
 <style lang="scss" scoped>
 .imageUrl {
-	text-align: center !important;
 	margin-top: 30px;
 	width: 100%;
-	height: 230px
+	height: 100%;
+	background-color: white;
 }
 
 .imageUrlin {
-	width: 55%;
+	width: 50%;
 	height: 200px;
 	margin-left: auto;
 	margin-right: auto;
@@ -357,6 +377,13 @@ export default {
 	padding: 14rpx 32rpx;
 	margin-top: 90rpx;
 	margin-bottom: 140rpx;
+	background-color: white;
+}
+
+.list-nav3 {
+	margin-top: 2rpx;
+	height: 500px;
+	background-image: url('http://wine.gzzzyd.com/test/static/img/bg.a82f9752.jpg');
 }
 
 .list .item {
@@ -472,8 +499,8 @@ export default {
 }
 
 .record-wrapper {
-	margin-top: 110rpx;
-
+	margin-top: 90rpx;
+	background-color: white;
 	.item {
 		padding-right: 30rpx;
 		padding-left: 30rpx;

pages/users/user_wallet/index.vue

@@ -38,9 +38,6 @@
 					</view>
 				</view>
 			</view>
-			<view>
-				<button class='add-link'>提现</button>
-			</view>
 		</view>
 	</view>
 </template>