From 7ab8a291ea35042a7139e6cc40c781f64fb48eaf Mon Sep 17 00:00:00 2001
From: yyc <1477138655@qq.com>
Date: Mon, 17 Jul 2023 17:44:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=AF=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/otc/otcAppealOrder/index.vue | 52 +++++++++++++++++++++-----
 src/views/user/userCustomer/index.vue  |  9 +++--
 vue.config.js                          |  4 +-
 3 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/src/views/otc/otcAppealOrder/index.vue b/src/views/otc/otcAppealOrder/index.vue
index e1818a5..5883cd1 100644
--- a/src/views/otc/otcAppealOrder/index.vue
+++ b/src/views/otc/otcAppealOrder/index.vue
@@ -114,13 +114,13 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button v-if="scope.row.appealImgUrl!=''"
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['otc:otcAppealOrder:edit']"
-          >查询图片</el-button>
+<!--          <el-button v-if="scope.row.appealImgUrl!=''"-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['otc:otcAppealOrder:edit']"-->
+<!--          >申诉凭证</el-button>-->
           <el-button v-if="scope.row.appealStatus=='in_appeal'"
             size="mini"
             type="text"
@@ -208,11 +208,34 @@
     </el-dialog>
 
     <!-- 申诉OTC申诉订单对话框 -->
-    <el-dialog :title="title" :visible.sync="openApple" width="500px" append-to-body>
-      <el-form ref="form" :model="formApple" :rules="rulesApple" label-width="80px">
+    <el-dialog :title="title" :visible.sync="openApple" width="700px" append-to-body>
+      <el-form ref="form" :model="formApple" :rules="rulesApple" label-width="120px">
         <el-form-item label="订单编号" prop="otcOrderId" hidden="hidden">
           <el-input v-model="formApple.otcOrderId" placeholder="请输入订单编号" />
         </el-form-item>
+        <el-form-item label="申诉方" prop="tradeType">
+          <el-select v-model="formApple.tradeType" placeholder="申诉方"  disabled="disabled">
+            <el-option
+              v-for="dict in appealTradeTypeOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="申诉方昵称" prop="appealUserName">
+          <el-input v-model="formApple.appealUserName" placeholder="请输入申诉人昵称" />
+        </el-form-item>
+        <el-form-item label="申诉缘由" prop="appealRemark">
+          <el-input v-model="formApple.appealRemark" placeholder="请输入订单编号" />
+        </el-form-item>
+        <el-form-item label="被申诉方昵称" prop="beAppealUserName">
+          <el-input v-model="formApple.beAppealUserName" placeholder="请输入被申诉方昵称" />
+        </el-form-item>
+        <el-form-item label="申诉图片" prop="appealImgUrl" >
+        <img v-image-preview v-for="dict in formApple.listUrl" v-if="formApple.appealImgUrl" :src="dict"
+             class="avatar" style="width: 150px" height="150px" @click="previewImage(dict)" >
+        </el-form-item>
         <el-form-item label="申诉状态">
           <el-radio-group v-model="formApple.appealStatus">
             <el-radio label="success_appeal">申诉成功</el-radio>
@@ -256,6 +279,8 @@ export default {
       otcAppealOrderList: [],
       appealStatusOptions: [],
       terminalSourceOptions:[],
+      appealTradeTypeOptions:[],
+
       // 弹出层标题
       title: "",
       titleApple: "",
@@ -304,6 +329,9 @@ export default {
     this.getDicts("terminal_source").then(response => {
       this.terminalSourceOptions = response.data;
     });
+    this.getDicts("appeal_trade_type").then(response => {
+      this.appealTradeTypeOptions = response.data;
+    });
   },
   methods: {
     // 预览图片
@@ -370,7 +398,11 @@ export default {
         terminalSource: null,
         appealUserId: null,
         beAppealUserId: null,
-        appealDesc: null
+        appealDesc: null,
+        appealUserName:null,
+        beAppealUserName:null,
+        tradeType:null,
+
       };
       this.resetForm("formApple");
     },
diff --git a/src/views/user/userCustomer/index.vue b/src/views/user/userCustomer/index.vue
index 59c4d1f..f5ce572 100644
--- a/src/views/user/userCustomer/index.vue
+++ b/src/views/user/userCustomer/index.vue
@@ -129,7 +129,9 @@
           <el-button v-if="scope.row.authLevel == '1' || scope.row.authLevel == '2'" size="mini" type="text"
             @click="handleUpdate(scope.row)" v-hasPermi="['user:userCustomer:edit']">修改认证级别
           </el-button>
-
+<!--          <el-button size="mini" type="text"-->
+<!--                     @click="handleUpdate(scope.row)" v-hasPermi="['user:userCustomer:edit']">设置为系统商户-->
+<!--          </el-button>-->
         </template>
       </el-table-column> -->
     </el-table>
@@ -288,13 +290,14 @@ export default {
 
     // 用户状态修改
     handleStatusChange(row) {
-      let text = row.status === "0" ? "启用" : "停用";
+      console.log(row.status)
+      let text = row.status === "normal" ? "启用" : "停用";
       this.$modal.confirm('确认要"' + text + '""' + row.name + '"用户吗？').then(function () {
         return changeUserStatus(row.userId, row.status);
       }).then(() => {
         this.$modal.msgSuccess(text + "成功");
       }).catch(function () {
-        row.status = row.status === "0" ? "1" : "0";
+        row.status = row.status === "frozen" ? "normal" : "frozen";
       });
     },
     // 预览图片
diff --git a/vue.config.js b/vue.config.js
index bb8f2f6..7f55416 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,9 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://bitcopay-admin.weirui0755.com/stage-api`,
+        // target: `http://bitcopay-admin.weirui0755.com/stage-api`,
+        target: `http://localhost:5500`,
+
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''