222

manifest.json

@@ -2,8 +2,8 @@
     "name" : "万吉商城",
     "appid" : "__UNI__F0EBD91",
     "description" : "",
-    "versionName" : "1.1.7",
-    "versionCode" : 117,
+    "versionName" : "1.2.1",
+    "versionCode" : 121,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages/money/account.vue

@@ -16,7 +16,7 @@
 				</view>
 				<view class="row b-b" v-if="tabIndex == 1">
 					<text class="tit">所属银行</text>
-					<input class="input" v-model="tabItem.orderList.bankName" type="text" placeholder="请输入账号" placeholder-class="placeholder" />
+					<input class="input" v-model="tabItem.orderList.bankName" type="text" placeholder="请输入所属银行" placeholder-class="placeholder" />
 				</view>
 			</swiper-item>
 		</swiper>

pages/money/withdrawal.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<uni-notice-bar single="true" text="每月25号到月底可提现上月结算余额"></uni-notice-bar>
+		<uni-notice-bar single="true" text="每周一统一打款"></uni-notice-bar>
 		<view class="content-money">
 			<view class="flex ">
 				<view class="buttom">
@@ -26,7 +26,7 @@
 		<!-- #ifndef MP-WEIXIN -->
 		<view class="list" v-if="!weichatBsrowser">
 			<radio-group @change="tabRadio">
-				<label>
+				<!-- <label>
 					<view class="box">
 						<view class="icon iconfont iconweixin1"></view>
 						<view class="title-box">
@@ -34,7 +34,7 @@
 						</view>
 						<view class="right"><radio value="weixin" color="#5dbc7c" :checked="type == 'weixin'" /></view>
 					</view>
-				</label>
+				</label> -->
 				<label>
 					<view class="box">
 						<view class="icon iconfont iconzhifubao"></view>
@@ -86,7 +86,7 @@ export default {
 	},
 	data() {
 		return {
-			type: 'weixin', //提现方式
+			type: 'alipay', //提现方式
 			money: '0.00', //可提现金额
 			freeze: '0.0', //冻结金额
 			withdrawal: '', //提现金额
@@ -129,7 +129,7 @@ export default {
 		// 加载余额信息
 		async loadData() {
 			extractBank({}).then(({ data }) => {
-				this.money = data.moneyCount;//可提现余额
+				this.money = data.commissionCount;//可提现余额
 				this.minPrice = data.minPrice;//最小提现
 				this.freeze =data.inmoneyCount//提现中的余额
 			});

pages/product/common/productBottom.vue

@@ -32,11 +32,15 @@ export default {
 		}
 	},
 	data() {
-		return {};
+		return {
+			id:'',
+		};
 	},
 	methods: {
 		buy(type) {
 			this.$emit('specOPne',type);
+			
+			
 		},
 		//收藏
 		toFavorite(item) {

pages/product/product.vue

@@ -17,7 +17,7 @@
 		<!-- 底部高度撑开 -->
 		<view class="contentBottomHeight"></view>
 		<!-- 底部操作菜单 -->
-		<product-bottom v-if="goodsObjact.id" @buy="buy" :goodsObjact="goodsObjact" :goodsid="goodsid" @specOPne="specOPne"></product-bottom>
+		<product-bottom v-if="goodsObjact.id" @buy="buy" :goodsObjact="goodsObjact" :goodsid="goodsid" @specOPne="specOPne" ></product-bottom>
 		<!-- 规格-模态层弹窗 -->
 		<view class="popup spec" :class="specClass" @touchmove.stop.prevent="stopPrevent" @click="toggleSpec">
 			<!-- 遮罩层 -->
@@ -101,6 +101,7 @@ export default {
 	},
 	data() {
 		return {
+			gpId:'',//公牌id
 			goodsStore: 0, //选中库存
 			specList: [],
 			buys_show: true,