refactor:取消支付密码

orderPages/bookService/index.vue

@@ -306,17 +306,17 @@ export default {
         balancePay(){
 
             let that = this;
-            if(this.password.length< 6 ){
-                uni.showToast({
-                    title: "交易密码不能小于6位"
-                })
-                return ;
-            }
-            this.$refs.passwordPopup.close()
-            // 用户信息
+            // if(this.password.length< 6 ){
+            //     uni.showToast({
+            //         title: "交易密码不能小于6位"
+            //     })
+            //     return ;
+            // }
+            // this.$refs.passwordPopup.close()
+
             this.$api.balancePay({
-                orderNo: this.subOrderNo,
-                password: this.password
+                orderNo: this.subOrderNo
+                // password: this.password
             }).then((res)=>{
 
                 uni.showToast({
@@ -377,7 +377,9 @@ export default {
               }else{
                   if (this.curServiceTab === 1){
                       //开启余额支付密码框
-                    this.$refs.passwordPopup.open()
+                    // this.$refs.passwordPopup.open()
+
+                      this.balancePay()
 
                   }
                   if (this.curServiceTab === 2){

orderPages/orderDetail/index.vue

@@ -143,7 +143,7 @@
                         <text  class="unpaid">待支付</text>
                         <text  class="preferentialPrice">¥{{allPrice}}</text>
                         <text  class="originalPrice">¥{{allPrice}}</text>
-                        <text  class="priceDetail">价格明细</text>
+<!--                        <text  class="priceDetail">价格明细</text>-->
                     </view>
 
                     <view class="btn" @click="qenPayInfo">
@@ -288,18 +288,18 @@ export default {
       },
         balancePay(){
 
-            let that = this;
-            if(this.password.length< 6 ){
-                uni.showToast({
-                    title: "交易密码不能小于6位"
-                })
-                return ;
-            }
-            this.$refs.passwordPopup.close()
+            // let that = this;
+            // if(this.password.length< 6 ){
+            //     uni.showToast({
+            //         title: "交易密码不能小于6位"
+            //     })
+            //     return ;
+            // }
+            // this.$refs.passwordPopup.close()
 
             this.$api.trade({
-                tradeNo: this.tradeNo,
-                password: this.password
+                tradeNo: this.tradeNo
+                // password: this.password
             }).then((res)=>{
                 uni.showToast({
                     title: '支付成功!'
@@ -328,9 +328,12 @@ export default {
         commonGeneralOrder(){
             let that =this
             if (this.curServiceTab===1){
-                that.password = '';
-                this.$refs.popup.close()
-                this.$refs.passwordPopup.open()
+                // that.password = '';
+                // this.$refs.popup.close()
+                // this.$refs.passwordPopup.open()
+
+                this.balancePay()
+
             }else {
                 this.$api.wechatPayTradeNo({tradeNo:this.tradeNo}).then(res=>{
                     var param = res.data.data;

pages/order/index.vue

@@ -266,20 +266,20 @@
 			balancePay(){
 
 				let that = this;
-				if(this.password.length< 6 ){
-					uni.showToast({
-						title: "交易密码不能小于6位"
-					})
-					return ;
-				}
-				this.$refs.passwordPopup.close()
+				// if(this.password.length< 6 ){
+				// 	uni.showToast({
+				// 		title: "交易密码不能小于6位"
+				// 	})
+				// 	return ;
+				// }
+				// this.$refs.passwordPopup.close()
 				// 用户信息
 
 				if (this.openType == 2){
 					//支付预约费用
 					this.$api.balancePay({
-						orderNo: this.appointmentOrder.subOrderNo,
-						password: this.password
+						orderNo: this.appointmentOrder.subOrderNo
+						// password: this.password
 					}).then((res)=>{
 						uni.showToast({
 							title: '支付成功'
@@ -298,8 +298,8 @@
 				}else {
 					//支付子订单费用
 					this.$api.trade({
-						tradeNo: this.tradeNo,
-						password: this.password
+						tradeNo: this.tradeNo
+						// password: this.password
 					}).then((res)=>{
 						uni.showToast({
 							title: '支付成功'
@@ -348,9 +348,10 @@
 			commonGeneralOrder(){
 				let that =this
 				if (this.curServiceTab===1){
-					this.$refs.popup.close()
-					that.password = ''
-					this.$refs.passwordPopup.open()
+					// this.$refs.popup.close()
+					// that.password = ''
+					// this.$refs.passwordPopup.open()
+					this.balancePay()
 				}else {
 
 					if (this.openType == 2){

storePages/store/store-choose.vue

@@ -38,8 +38,8 @@
 						<!-- <text class="h-text">4.2km</text> -->
 					</view>
 				</view>
-				<view class="h-row">
-					<view @click="selectStore(item)"  class="h-left-value">
+				<view class="h-row" @click="selectStore(item)">
+					<view   class="h-left-value">
 						<view class="h-text">
 							<image src="../../static/index/u55.png" mode=""></image>
 							<text>地址：{{item.address}}</text>
@@ -49,14 +49,14 @@
 							营业时间：<text>{{item.tradeTime}}~{{item.gooutTime}}</text>
 						</view>
 					</view>
-					<view class="h-right-value h-flex">
-						<view  class="phone">
-							<image src="../../static/goods/u291.png" mode=""></image>
-						</view>
-						<view  class="sure">
-							<image src="../../static/goods/u292.png" mode=""></image>
-						</view>
-					</view>
+<!--					<view class="h-right-value h-flex">-->
+<!--						<view  class="phone">-->
+<!--							<image src="../../static/goods/u291.png" mode=""></image>-->
+<!--						</view>-->
+<!--						<view  class="sure">-->
+<!--							<image src="../../static/goods/u292.png" mode=""></image>-->
+<!--						</view>-->
+<!--					</view>-->
 				</view>
 			</view>
 		</view>