sunlupeng 1 tahun lalu
induk
melakukan
89718fbd5e

+ 1 - 1
config/dev.env.js

@@ -3,7 +3,7 @@ module.exports = {
 	ENV_CONFIG: '"dev"',
   // 本地数据库:登录用户名 admin123,密码 admin123
   BASE_API: '"http://192.168.100.208:9083/admin"',
-  OS_API: '"http://192.168.100.208:9083/storage"',
+  OS_API: '"https://xiaoyou.dgtis.com/admin"',
   // OS_API: '"https://xiaoyou.dgtis.com/admin"',
   // BASE_API: '"https://xiaoyou.dgtis.com/admin"',
   

+ 1 - 1
config/prod.env.js

@@ -6,7 +6,7 @@ module.exports = {
   //BASE_API: '"http://alumni.sppm.tsinghua.edu.cn/admin"',
 	//通誉环境
   BASE_API: '"http://47.103.79.143:9085/admin"',
-  OS_API: '"http://47.103.79.143:9085/storage"'
+  OS_API: '"https://xiaoyou.dgtis.com/admin"'
   // BASE_API: '"https://xiaoyou.dgtis.com/admin"',
   // OS_API: '"https://xiaoyou.dgtis.com/admin"'
 }

+ 2 - 0
src/views/certManage/certList.vue

@@ -27,6 +27,8 @@
         </el-table-column>
         <el-table-column align="center" min-width="80px" label="类型" prop="typeName">
         </el-table-column>
+        <el-table-column align="center" prop="categoryName" min-width="100" label="名称">
+        </el-table-column>
         <el-table-column align="center" min-width="80px" label="上传人" prop="userName">
         </el-table-column>
         <el-table-column align="center" min-width="200px" label="公司" prop="companyName">

+ 18 - 6
src/views/exchangeManage/exchangeList.vue

@@ -121,12 +121,24 @@
                     <el-form-item label="兑换方式">
                         <el-input readonly v-model="detailData.deliveryTypeName"></el-input>
                     </el-form-item>
-                    <el-form-item v-if="detailData.deliveryType == 1 && (detailData.orderType == 0 || detailData.orderType == 4)" label="快递单号">
-                        <el-input v-model="detailData.trackingNumber"></el-input>
-                    </el-form-item>
-                    <el-form-item v-else label="快递单号">
-                        <el-input readonly v-model="detailData.trackingNumber"></el-input>
-                    </el-form-item>
+                    <div v-if="detailData.deliveryType == 1">
+                        <el-form-item v-if="detailData.orderType == 0" label="快递单号">
+                            <el-input v-model="detailData.trackingNumber"></el-input>
+                        </el-form-item>
+                        <el-form-item v-else label="快递单号">
+                            <el-input readonly v-model="detailData.trackingNumber"></el-input>
+                        </el-form-item>
+                    </div>
+                    <div v-if="detailData.deliveryType == 0 && detailData.productAttribute == 2">
+                        <el-form-item v-if="detailData.orderType == 0" label="兑换码">
+                            <el-input v-model="detailData.trackingNumber"></el-input>
+                        </el-form-item>
+                        <el-form-item v-else label="兑换码">
+                            <el-input readonly v-model="detailData.trackingNumber"></el-input>
+                        </el-form-item>
+                    </div>
+                    
+                    
                 </div>
 
                 <el-form-item v-if="detailData.orderType == 0 || detailData.orderType == 4" label="备注">