Prechádzať zdrojové kódy

兑换管理 添加直充 是显示充值账号

sunlupeng 2 rokov pred
rodič
commit
0bee3fc28d

+ 5 - 5
config/prod.env.js

@@ -1,10 +1,10 @@
 module.exports = {
 	NODE_ENV: '"production"',
 	ENV_CONFIG: '"prod"',
-	//阿里云环境
-  // BASE_API: '"http://47.103.79.143:9085/admin"',
-  // OS_API: '"http://47.103.79.143:9085/admin"'
+	// 阿里云环境
+  BASE_API: '"http://47.103.79.143:9085/admin"',
+  OS_API: '"http://47.103.79.143:9085/admin"'
   //正式环境
-  BASE_API: '"https://xiaoyou.dgtis.com/admin"',
-  OS_API: '"https://xiaoyou.dgtis.com/admin"'
+  // BASE_API: '"https://xiaoyou.dgtis.com/admin"',
+  // OS_API: '"https://xiaoyou.dgtis.com/admin"'
 }

+ 11 - 9
src/views/exchangeManage/cancelledList.vue

@@ -153,18 +153,20 @@
                         <el-input disabled v-model="detailData.deliveryTypeName"></el-input>
                     </el-form-item>
                 </div>
-                <div style="display: flex;">
-                    
-                    <div v-if="detailData.deliveryType == 1 && detailData.trackingNumber">
-                        <el-form-item label="快递单号">
-                            <el-input disabled v-model="detailData.trackingNumber"></el-input>
+                <div style="display: flex;" v-if="detailData.deliveryType == 4">
+                        <el-form-item label="充值账号">
+                            <el-input disabled v-model="detailData.contactPhone"></el-input>
                         </el-form-item>
-                    </div>
-                    <div v-if="detailData.deliveryType == 2 && detailData.trackingNumber">
-                        <el-form-item label="兑换码">
+                </div>
+                <div v-if="detailData.deliveryType == 1">
+                        <el-form-item label="快递单号">
                             <el-input disabled v-model="detailData.trackingNumber"></el-input>
                         </el-form-item>
-                    </div>
+                </div>
+                <div v-if="detailData.deliveryType == 2">
+                    <el-form-item label="兑换码">
+                            <el-input disabled style="width: 100%"  type="textarea" :rows="2" v-model="detailData.trackingNumber"></el-input>
+                    </el-form-item>
                 </div>
             </el-form>
 

+ 11 - 9
src/views/exchangeManage/exchangeList.vue

@@ -157,18 +157,20 @@
                         <el-input disabled v-model="detailData.deliveryTypeName"></el-input>
                     </el-form-item>
                 </div>
-                <div style="display: flex;">
-                    
-                    <div v-if="detailData.deliveryType == 1 && detailData.trackingNumber">
-                        <el-form-item label="快递单号">
-                            <el-input disabled v-model="detailData.trackingNumber"></el-input>
+                <div style="display: flex;" v-if="detailData.deliveryType == 4">
+                        <el-form-item label="充值账号">
+                            <el-input disabled v-model="detailData.contactPhone"></el-input>
                         </el-form-item>
-                    </div>
-                    <div v-if="detailData.deliveryType == 2 && detailData.trackingNumber">
-                        <el-form-item label="兑换码">
+                </div>
+                <div v-if="detailData.deliveryType == 1">
+                        <el-form-item label="快递单号">
                             <el-input disabled v-model="detailData.trackingNumber"></el-input>
                         </el-form-item>
-                    </div>
+                </div>
+                <div v-if="detailData.deliveryType == 2">
+                    <el-form-item label="兑换码">
+                            <el-input disabled style="width: 100%"  type="textarea" :rows="2" v-model="detailData.trackingNumber"></el-input>
+                    </el-form-item>
                 </div>
             </el-form>
 

+ 5 - 1
src/views/exchangeManage/pasList.vue

@@ -160,7 +160,11 @@
                 
                     
                     
-                
+                <div style="display: flex;" v-if="detailData.deliveryType == 4">
+                        <el-form-item label="充值账号">
+                            <el-input disabled v-model="detailData.contactPhone"></el-input>
+                        </el-form-item>
+                </div>
                 <div v-if="detailData.deliveryType == 1">
                         <el-form-item label="快递单号">
                             <el-input v-model="detailData.trackingNumber"></el-input>

+ 11 - 9
src/views/exchangeManage/voidList.vue

@@ -154,18 +154,20 @@
                         <el-input disabled v-model="detailData.deliveryTypeName"></el-input>
                     </el-form-item>
                 </div>
-                <div style="display: flex;">
-                    
-                    <div v-if="detailData.deliveryType == 1 && detailData.trackingNumber">
-                        <el-form-item label="快递单号">
-                            <el-input disabled v-model="detailData.trackingNumber"></el-input>
+                <div style="display: flex;" v-if="detailData.deliveryType == 4">
+                        <el-form-item label="充值账号">
+                            <el-input disabled v-model="detailData.contactPhone"></el-input>
                         </el-form-item>
-                    </div>
-                    <div v-if="detailData.deliveryType == 2 && detailData.trackingNumber">
-                        <el-form-item label="兑换码">
+                </div>
+                <div v-if="detailData.deliveryType == 1">
+                        <el-form-item label="快递单号">
                             <el-input disabled v-model="detailData.trackingNumber"></el-input>
                         </el-form-item>
-                    </div>
+                </div>
+                <div v-if="detailData.deliveryType == 2">
+                    <el-form-item label="兑换码">
+                            <el-input disabled style="width: 100%"  type="textarea" :rows="2" v-model="detailData.trackingNumber"></el-input>
+                    </el-form-item>
                 </div>
 
                 <el-form-item label="备注">