change title

pages.json

@@ -1807,12 +1807,12 @@
 						}
 					}
 				},
-				{
-					"path": "three/index",
-					"style": {
-						"navigationBarTitleText": "花费充值"
-					}
-				},
+				// {
+				// 	"path": "three/index",
+				// 	"style": {
+				// 		"navigationBarTitleText": "花费充值"
+				// 	}
+				// },
 				{
 					"path": "three/order",
 					"style": {

pages/goods/order_list/serve.vue

@@ -112,8 +112,8 @@
 						<view class="bnt cancelBnt" v-if="item.status == -1 && item.refund_status == -1 ">退款已拒绝</view>
 					</view>
 					<view class="bottom acea-row row-right row-middle" v-if="item.status == 2">
-						<view class="bnt cancelBnt" v-if="item.reward && item.reward.id">已打赏</view>
-						<view class="bnt cancelBnt showbtn" v-else @click="das(item)">打赏</view>
+						<view class="bnt cancelBnt" v-if="item.reward && item.reward.id">已表扬</view>
+						<view class="bnt cancelBnt showbtn" v-else @click="das(item)">表扬</view>
 						<view class="bnt cancelBnt " v-if="item.complaint && item.complaint.id" >已投诉</view>
 						<view class="bnt cancelBnt " v-else @click="ts(item)">投诉</view>
 					</view>
@@ -138,7 +138,7 @@
 				<view class="tit">
 					多少都是您的心意
 				</view>
-				<input type="number" v-model="dsPrice" placeholder="请输入任意打赏金额"/>
+				<input type="number" v-model="dsPrice" placeholder="请输入任意表扬金额(1~5)"/>
 				<view class="btn-wrap">
 					<view class="btn" @click="closeDs">
 						取消
@@ -372,7 +372,12 @@
 				let that = this;
 				if(!that.dsPrice) {
 					return that.$util.Tips({
-						title: '请输入打赏金额'
+						title: '请输入表扬金额'
+					});
+				}
+				if(that.dsPrice > 5) {
+					return that.$util.Tips({
+						title: '输入金额过大，请慎重考虑'
 					});
 				}
 				that.totalPrice = that.dsPrice + ''
@@ -396,6 +401,7 @@
 					that.$util.Tips({
 						title: '投诉已提交'
 					})
+					that.getOrderList('re')
 				}).catch(err=> {
 					that.$util.Tips({
 						title: err.msg
@@ -626,7 +632,7 @@
 			pay_complete: function() {
 				this.$set(this, 'pay_close', false);
 				 // this.page = 1;
-				this.getOrderList()
+				that.getOrderList('re')
 				// this.loadend = false;
 				// // this.page = 1;
 				// this.$set(this, 'orderList', []);
@@ -691,8 +697,14 @@
 			/**
 			 * 获取订单列表
 			 */
-			getOrderList: function() {
+			getOrderList: function(ttype) {
 				let that = this;
+				if(ttype == 're') {
+					that.loadend = false;
+					that.loading = false;
+					that.orderList = [];
+					that.page = 1
+				}
 				if (that.loadend) return;
 				if (that.loading) return;
 				that.loading = true;

pages/users/user_cash/index.vue

@@ -39,6 +39,9 @@
 							当前可提现金额: <text
 								class="price">￥{{userInfo.commissionCount}}</text>,冻结佣金：￥{{userInfo.broken_commission}}
 						</view>
+						<view class='tip'>
+							创业金(不可提现): <text class="price">￥{{member_withdrawal_guarantee}}</text>
+						</view>
 						<view class='tip'>
 							提现手续费: <text class="price">{{withdraw_fee}}%</text>,实际到账:<text class="price">￥{{true_money}}</text>
 						</view>
@@ -81,6 +84,9 @@
 						<view class='tip'>
 							提现手续费: <text class="price">{{withdraw_fee}}%</text>,实际到账:<text class="price">￥{{true_money}}</text>
 						</view>
+						<view class='tip'>
+							创业金(不可提现): <text class="price">￥{{member_withdrawal_guarantee}}</text>
+						</view>
 						<view class='tip'>
 							说明: 每笔佣金的冻结期为{{userInfo.broken_day}}天，到期后可提现
 						</view>
@@ -120,6 +126,9 @@
 						<view class='tip'>
 							提现手续费: <text class="price">{{withdraw_fee}}%</text>,实际到账:<text class="price">￥{{true_money}}</text>
 						</view>
+						<view class='tip'>
+							创业金(不可提现): <text class="price">￥{{member_withdrawal_guarantee}}</text>
+						</view>
 						<view class='tip'>
 							说明: 每笔佣金的冻结期为{{userInfo.broken_day}}天，到期后可提现
 						</view>
@@ -167,7 +176,8 @@
 				moneyMaxLeng: 8,
 				withdraw_fee: '0',
 				true_money: 0,
-				extract_wechat_type:0
+				extract_wechat_type:0,
+				member_withdrawal_guarantee: 0
 			};
 		},
 		computed: mapGetters(['isLogin']),
@@ -249,6 +259,7 @@
 					let array = res.data.extractBank;
 					array.unshift("请选择银行");
 					that.$set(that, 'array', array);
+					that.member_withdrawal_guarantee = res.data.member_withdrawal_guarantee;
 					that.minPrice = res.data.minPrice;
 					that.withdraw_fee = res.data.withdraw_fee;
 					that.extract_wechat_type = res.data.extract_wechat_type;