预约单只有取衣收款

admin-ui/.env.development

@@ -5,10 +5,10 @@ VUE_APP_TITLE = 一七管理系统
 ENV = 'development'
 
 
-# VUE_APP_BASE_API_HOST = 'http://127.0.0.1:9801'
-# VUE_APP_BASE_API = 'http://127.0.0.1:9801'
-VUE_APP_BASE_API_HOST = 'http://139.224.65.227:8091/prod-api'
-VUE_APP_BASE_API = 'http://139.224.65.227:8091/prod-api'
+VUE_APP_BASE_API_HOST = 'http://127.0.0.1:9801'
+VUE_APP_BASE_API = 'http://127.0.0.1:9801'
+#VUE_APP_BASE_API_HOST = 'http://139.224.65.227:8091/prod-api'
+#VUE_APP_BASE_API = 'http://139.224.65.227:8091/prod-api'
 # VUE_APP_BASE_API_HOST = 'http://192.168.5.247:9801/'
 # VUE_APP_BASE_API = 'http://192.168.5.247:9801/'
 

admin-ui/src/views/order/cloth/component/cashCloth.vue

@@ -77,8 +77,8 @@
 
                             <!-- 支付按钮 -->
                             <div class="payment-actions">
-                                <el-button type="primary" size="large" icon="el-icon-shopping-cart-2" style="width: 180px" @click="submitForm(0)"> 立即收款 </el-button>
-                                <el-button type="warning" size="large" icon="el-icon-time" style="width: 180px" @click="submitForm(1)" v-if="orderForm.isAppointment!= 'Y'"> 取衣付款 </el-button>
+                                <el-button type="primary" size="large" icon="el-icon-shopping-cart-2" style="width: 180px" @click="submitForm(0)" v-if="orderForm.isAppointment!= 'Y'"> 立即收款 </el-button>
+                                <el-button type="warning" size="large" icon="el-icon-time" style="width: 180px" @click="submitForm(1)"> 取衣付款 </el-button>
                             </div>
                         </el-card>
                     </div>
@@ -866,7 +866,8 @@ export default {
                             loading.close();
                             // 直接打开支付状态弹窗，不需要延时
                           //0=微信，1=支付宝，2=现金，3=余额
-                          if (payTimeType == 0 && this.orderForm.isAppointment != 'Y') {
+                        //   && this.orderForm.isAppointment != 'Y'
+                          if (payTimeType == 0) {
                             if (this.orderForm.payType === '0') {
                                 res.data.authCode = this.orderForm.authCode
                                 this.$refs.payStatusPopup.open(0, {...params, ...res.data}, this.appUserInfo);