8-18-1

components/PageDesign/PageDesign.vue

@@ -12,10 +12,13 @@
 			<MagicImg v-if="item.comName === 'MagicImg'" :modelData="item.modelData" />
 			<Notice v-if="item.comName === 'Notice'" :modelData="item.modelData" :noticeData="item.data" />
 			<NavBar v-if="item.comName === 'NavBar'" :modelData="item.modelData" />
-			<view class="" v-if="temData[index].comName === 'NavBar' && temData[index+1].comName !== 'NavBar'">
-				<image src="http://up.liuniukj.com/167307900573324/931544405107da76ca2ec31cd63fae49/yyzq.png" mode=""
+			<view class="flex" v-if="temData[index].comName === 'NavBar' && temData[index+1].comName !== 'NavBar'">
+				<image src="http://up.liuniukj.com/16921750418414/3bef1eab4692142cfe373956646e6f70/yyzq.png" mode=""
 					class="banner-ad"
 					@click="navTo('/pagesT/unit/item')"></image>
+				<image src="http://up.liuniukj.com/169217504184137/3bef1eab4692142cfe373956646e6f70/lqzx.png" mode=""
+					class="banner-ad"
+					@click="navTo('/pagesT/user/GetCoupon')"></image>
 			</view>
 			<AdvGroup v-if="item.comName === 'AdvGroup'" :modelData="item.modelData" />
 			<GoodsGroup v-if="item.comName === 'GoodsGroup'" :modelData="item.modelData" :goodsList="item.data"
@@ -277,9 +280,13 @@
 	}
 
 	.banner-ad {
-		width: 690rpx;
+		width: 340rpx;
 		height: 190rpx;
 		display: block;
 		margin: 20rpx auto;
 	}
+	.flex {
+		display: flex;
+		justify-content: space-between;
+	}
 </style>

components/PageDesign/components/NavBar.vue

@@ -1,10 +1,19 @@
 <template>
 	<div class="NavBar clearfix" :style="{ backgroundColor: modelData.bgColor }">
-		<div class="nav-li" v-for="(item, index) in modelData.navList" :key="index"
-			:style="{ width: 100 / modelData.num + '%' }" @click="navTo(item.url, item.switchTab,item)">
-			<image class="nav-icon" :src="item.image.url" mode="aspectFit"></image>
-			<div :style="{ color: modelData.color }" class="nav-text">{{ item.text || '文字标题' }}</div>
-		</div>
+		<template v-for="(item, index) in modelData.navList" >
+			<div class="nav-li" v-if="item.text != '推荐分享'"
+				:style="{ width: 100 / modelData.num + '%' }" @click="navTo(item.url, item.switchTab,item)">
+				<image class="nav-icon" :src="item.image.url" mode="aspectFit"></image>
+				<div :style="{ color: modelData.color }" class="nav-text">{{ item.text || '文字标题' }}</div>
+			</div>
+			<button class="share-btn nav-li " open-type="share" v-if="item.text == '推荐分享'" :style="{ width: 100 / modelData.num + '%' }">
+				<view class="fn-icon">
+					<image class="nav-icon" :src="item.image.url" mode="aspectFit"></image>
+					<view :style="{ color: modelData.color }" class="nav-text">{{ item.text || '文字标题' }}</view>
+				</view>
+			</button>
+		</template>
+		
 		<NoLoginTip @cancel="cancelTip" :show="loginTip" v-if="loginTip" />
 	</div>
 </template>
@@ -29,7 +38,41 @@
 				loginTip: false
 			};
 		},
+		onShareAppMessage(options) {
+			return {
+				title: this.$store.state.baseSet.shop,
+				path: '/pages/index/index?businessmanId=' + (this.$store.state.userStatus.id || ''),
+				success: res => {
+					console.log(res);
+				}
+			};
+		},
 		methods: {
+			navto(url) {
+				// console.log(this.hasLogin)
+				// return
+				if (!this.$store.state.hasLogin) {
+					// #ifdef APP-PLUS
+					uni.reLaunch({
+						url: '/pagesT/public/wxLogin'
+					});
+					// #endif
+					// #ifdef MP-WEIXIN
+					uni.reLaunch({
+						url: '/pagesT/binding/bindInfo'
+					});
+					//#endif
+					// #ifdef H5
+					uni.navigateTo({
+						url: '/pagesT/public/wxLogin?loginType=2'
+					});
+					// #endif
+				} else {
+					uni.navigateTo({
+						url
+					});
+				}
+			},
 			cancelTip() {
 				this.loginTip = false;
 			},
@@ -57,6 +100,15 @@
 						this.goPage('/pagesT/unit/artdetail?type=1', switchTab);
 					}else if (item.text == '邀请好友') {
 						this.goPage('/pagesT/Distribution/Poster', switchTab);
+					}else if(item.text == '活动') {
+						// this.goPage('/pagesT/Distribution/Poster', switchTab);
+						this.navto('/pagesT/unit/yhk')
+					}else if(item.text == '活动') {
+						// this.goPage('/pagesT/Distribution/Poster', switchTab);
+						this.navto('/pagesT/unit/yhk')
+					}else if(item.text == '我的预约') {
+						// this.goPage('/pagesT/Distribution/Poster', switchTab);
+						this.navto('/pagesT/order/orderT?state=1')
 					}else {
 						this.goPage(url, switchTab);
 					}
@@ -94,4 +146,16 @@
 		font-weight: 400rpx;
 		margin-bottom: 24upx;
 	}
+	.share-btn::after {border: none;
+}
+.share-btn {
+	padding: 0;
+	margin: 0;
+	background: none;
+}
+.share-btn .nav-text {
+	/* color: red !important; */
+	display: inline !important;
+	
+}
 </style>

pages.json

@@ -101,7 +101,7 @@
 			{
 				"path": "unit/yhk",
 				"style": {
-					"navigationBarTitleText": "优惠卡"
+					"navigationBarTitleText": "会员项目"
 				}
 			},
 			{

pages/user/user.vue

@@ -249,12 +249,12 @@
 						<view>需求提报</view>
 					</view>
 				</view>
-				<view class="list-li clearfix" @click="navTo('/pagesT/user/guquan')">
+				<!-- <view class="list-li clearfix" @click="navTo('/pagesT/user/guquan')">
 					<view class="fn-icon">
 						<image src="https://api.junhailan.com/img/user/gq.png" mode="aspectFill"></image>
 						<view>股份</view>
 					</view>
-				</view>
+				</view> -->
 				<!-- #ifdef MP -->
 				<view class="list-li">
 					<button class="clearfix share-btn" open-type="share">

pagesT/money/Balance.vue

@@ -8,11 +8,11 @@
 			</view>
 		</view>
 		<view class="bth-ul">
-			<view class="btn-li" @click="goPage('/pagesT/money/addWithdrawal')">
+			<!-- <view class="btn-li" @click="goPage('/pagesT/money/addWithdrawal')">
 				<text class="ibonfont ibondaifukuan"></text>
 				<text class="label">余额提现</text>
 				<text class="ibonfont ibonjinru float_right"></text>
-			</view>
+			</view> -->
 
 			<view class="btn-li clearfix" @click="goPage('/pagesT/money/BalanceDetail')">
 				<text class="ibonfont ibonnavicon-jylstj"></text>

pagesT/money/BankPay.vue

@@ -1,78 +1,84 @@
 <template>
 	<view :class="['qn-page-' + theme]">
-		<u-navbar title="上传打款凭证" :custom-back="customBack"></u-navbar>
-		<view class="money-view">
-			<view class="num">
-				<text class="icon">¥</text>
-				{{ payAmount }}
+		<template v-if="!shenhe">
+			<u-navbar title="上传打款凭证" :custom-back="customBack"></u-navbar>
+			<view class="money-view">
+				<view class="num">
+					<text class="icon">¥</text>
+					{{ payAmount }}
+				</view>
+				<view class="label">订单金额</view>
 			</view>
-			<view class="label">订单金额</view>
-		</view>
-		<view class="bank-view">
-			<u-form label-width="180">
-				<u-form-item label="账户名称">
-					<view class="form-item-in">
-						<u-input @click="copyData(bank_data.name)" v-model="bank_data.name" disabled />
-						<text class="copy-text">复制</text>
-					</view>
-				</u-form-item>
-				<u-form-item label="开户行">
-					<view class="form-item-in">
-						<u-input @click="copyData(bank_data.bankName)" v-model="bank_data.bankName" disabled />
-						<text class="copy-text">复制</text>
-					</view>
-				</u-form-item>
-				<u-form-item label="开户人">
-					<view class="form-item-in">
-						<u-input @click="copyData(bank_data.bankAccount)" v-model="bank_data.bankAccount" disabled />
-						<text class="copy-text">复制</text>
-					</view>
-				</u-form-item>
-				<u-form-item label="银行账户">
-					<view class="form-item-in">
-						<u-input @click="copyData(bank_data.accountNumber)" v-model="bank_data.accountNumber"
-							disabled />
-						<text class="copy-text">复制</text>
-					</view>
-				</u-form-item>
-				<u-form-item label="上传凭证">
-					<QiniuUpload @uploadSuccess="uploadSuccess" :images="bank_data.image" @handleRemove="imgRemove">
-						<!-- <div slot="cont">
-							<view class="bank-license" v-for="item,index in bank_data.image" :key='index'>
-								<block v-if="item">
-									<img class="license-pic" :src="item" alt="" />
-									<u-icon name="close" class='del-icon' size='30' @click.stop="handleRemove(item, index)">
-									</u-icon>
-								</block>
-							</view>
-							<view class="bank-license">
-								<text>+</text>
-							</view>
-						</div> -->
-					</QiniuUpload>
-				</u-form-item>
-				<u-form-item label="备注">
-					<view class="form-item-in">
-						<u-input v-model="bank_data.remark" disabled />
-					</view>
-				</u-form-item>
-			</u-form>
-		</view>
-		<view class="confirm-btn primary-bg" @click="backConfirm">
-			<u-loading v-if="loading" mode="circle"></u-loading>
-			确定
-		</view>
+			<view class="bank-view">
+				<u-form label-width="180">
+					<u-form-item label="账户名称">
+						<view class="form-item-in">
+							<u-input @click="copyData(bank_data.name)" v-model="bank_data.name" disabled />
+							<text class="copy-text">复制</text>
+						</view>
+					</u-form-item>
+					<u-form-item label="开户行">
+						<view class="form-item-in">
+							<u-input @click="copyData(bank_data.bankName)" v-model="bank_data.bankName" disabled />
+							<text class="copy-text">复制</text>
+						</view>
+					</u-form-item>
+					<u-form-item label="开户人">
+						<view class="form-item-in">
+							<u-input @click="copyData(bank_data.bankAccount)" v-model="bank_data.bankAccount" disabled />
+							<text class="copy-text">复制</text>
+						</view>
+					</u-form-item>
+					<u-form-item label="银行账户">
+						<view class="form-item-in">
+							<u-input @click="copyData(bank_data.accountNumber)" v-model="bank_data.accountNumber"
+								disabled />
+							<text class="copy-text">复制</text>
+						</view>
+					</u-form-item>
+					<u-form-item label="上传凭证">
+						<QiniuUpload @uploadSuccess="uploadSuccess" :images="bank_data.image" @handleRemove="imgRemove">
+							<!-- <div slot="cont">
+								<view class="bank-license" v-for="item,index in bank_data.image" :key='index'>
+									<block v-if="item">
+										<img class="license-pic" :src="item" alt="" />
+										<u-icon name="close" class='del-icon' size='30' @click.stop="handleRemove(item, index)">
+										</u-icon>
+									</block>
+								</view>
+								<view class="bank-license">
+									<text>+</text>
+								</view>
+							</div> -->
+						</QiniuUpload>
+					</u-form-item>
+					<u-form-item label="备注">
+						<view class="form-item-in">
+							<u-input v-model="bank_data.remark" disabled />
+						</view>
+					</u-form-item>
+				</u-form>
+			</view>
+			<view class="confirm-btn primary-bg" @click="backConfirm">
+				<u-loading v-if="loading" mode="circle"></u-loading>
+				确定
+			</view>
+		</template>
 	</view>
 </template>
 
 <script>
 	import QiniuUpload from '../components/qiniu/QiniuUpload.vue';
+	
+	
+	
 	export default {
 		components: {
 			QiniuUpload
 		},
 		data() {
 			return {
+				shenhe: true,//true->审核中 false->已过审
 				loading: false,
 				bank_data: {
 					// 银行信息
@@ -100,8 +106,16 @@
 			// #ifdef MP-WEIXIN
 			this.getSettingDataByMessageId()
 			// #endif
+			this.getSh()
 		},
 		methods: {
+			getSh() {
+				this.$u.api.getBasicField({'field': ["shenhe"]}).then(({data})=> {
+					// this.shenhe = data/
+					// console.log(data);
+					this.shenhe = data.shenhe
+				})
+			},
 			// 复制到剪贴板
 			copyData(data) {
 				uni.setClipboardData({

pagesT/unit/itemdetail.vue

@@ -157,7 +157,7 @@
 								<text  class="float_right ibonfont  ibonxuanze1" style="color: #CCCCCC;" v-else></text>
 							</view>
 						</view>
-						<!-- <view class="pay-li" @click="choosPayType(2)" v-if="goods_detail.price*1 > 0">
+						<view class="pay-li" @click="choosPayType(2)" v-if="goods_detail.price*1 > 0">
 							<text class="ibonfont ibonweixinzhifu"></text>
 							<view class="pay-name clearfix ">
 								<view class="float_left">
@@ -166,7 +166,7 @@
 								<text class="float_right ibonfont ibonxuanze1" v-if="pay_type == 2"></text>
 								<text class="float_right ibonfont ibonxuanze1" style="color: #CCCCCC;" v-else></text>
 							</view>
-						</view> -->
+						</view>
 					</view>
 					<view class="pay-btn primary-btn" @click="submit">
 						<text>确定</text>
@@ -761,9 +761,13 @@
 							success: res => {
 								// 订单审核，取消订单提醒
 								that.payPop = false
+								console.log('微信支付成功');
 								setTimeout(() => {
-									this.otheMsgTip('/pagesT/money/paySuccess?price=' + this
-										.goods_detail.price + '&isyhq=1');
+									uni.navigateTo({
+										url:'/pagesT/money/paySuccess?price=' + that.goods_detail.price + '&isyhq=1'
+									})
+									// this.otheMsgTip('/pagesT/money/paySuccess?price=' + this
+									// 	.goods_detail.price + '&isyhq=1');
 								}, 200);
 							},
 							fail: async err => {

pagesT/unit/yhk.vue

@@ -12,9 +12,9 @@
 					<view class="price">
 						{{item.price}}
 					</view>
-					<view class="xl">
+					<!-- <view class="xl">
 						销量：{{item.sold}}
-					</view>
+					</view> -->
 				</view>
 			</view>
 		</view>

pagesT/user/dyquan.vue

@@ -16,11 +16,11 @@
 						</view>
 					</view>
 				</view>
-				<view class="btm">
+				<!-- <view class="btm">
 					<view class="primary-btn btn" @click="goPage('/pagesT/unit/itemdetail?id=' + item.project_id)">
 						立即使用
 					</view>
-				</view>
+				</view> -->
 			</view>
 
 			<u-loadmore :status="loadingType" />