fix merge

src/views/refund/gold/addCoinRefund.vue

@@ -1,6 +1,6 @@
 <script setup>
-import {computed, onMounted, reactive, ref, watch} from 'vue'
-import {ElMessage, ElMessageBox} from 'element-plus'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import API from '@/util/http.js'
 import moment from 'moment'
 // import _ from 'lodash'
@@ -14,7 +14,7 @@ const addRe = ref({
 const adminData = ref({})
 const getAdminData = async function () {
   try {
-    const result = await API({url: '/admin/userinfo', data: {}})
+    const result = await API({ url: '/admin/userinfo', data: {} })
     adminData.value = result
     addRefund.value.adminId = adminData.value.id
     console.log('请求成功', result)
@@ -120,13 +120,13 @@ const addBefore = () => {
       // }
 
       ElMessageBox.confirm('确认退款？')
-          .then(() => {
-            add()
-            console.log('退款成功')
-          })
-          .catch(() => {
-            console.log('取消退款')
-          })
+        .then(() => {
+          add()
+          console.log('退款成功')
+        })
+        .catch(() => {
+          console.log('取消退款')
+        })
     } else {
       //提示
       ElMessage({
@@ -154,18 +154,18 @@ const validateJwCode = (rule, value, callback) => {
   callback();
 };
 const rules = reactive({
-  jwcode: [{required: true, validator: validateJwCode, trigger: 'blur'}],
-  refundType: [{required: true, message: '请选择退款类型', trigger: 'blur'}],
-  goodsName: [{required: false, message: '请选择退款商品', trigger: 'blur'}],
+  jwcode: [{ required: true, validator: validateJwCode, trigger: 'blur' }],
+  refundType: [{ required: true, message: '请选择退款类型', trigger: 'blur' }],
+  goodsName: [{ required: false, message: '请选择退款商品', trigger: 'blur' }],
   // 订单号
-  orderCode: [{required: true, message: '请输入订单号', trigger: 'blur'}],
-  taskGold: [{required: true, message: '请输入任务金币', trigger: 'blur'}],
-  freeGold: [{required: true, message: '请输入免费金币', trigger: 'blur'}],
+  orderCode: [{ required: true, message: '请输入订单号', trigger: 'blur' }],
+  taskGold: [{ required: true, message: '请输入任务金币', trigger: 'blur' }],
+  freeGold: [{ required: true, message: '请输入免费金币', trigger: 'blur' }],
   permanentGold: [
-    {required: true, message: '请输入永久金币', trigger: 'blur'}
+    { required: true, message: '请输入永久金币', trigger: 'blur' }
   ],
   sumGold: [
-    {required: true, message: '请选择付款方式', trigger: 'blur'},
+    { required: true, message: '请选择付款方式', trigger: 'blur' },
     {
       validator: (rule, value) => {
         if (value === 0) {
@@ -235,11 +235,11 @@ const getUser = async function (jwcode) {
       // 对传过来的金币数除以 100
       const processedData = {
         ...result.data,
-        historySumGold: (Number(result.data.historySumGold) || 0) ,
-        nowSumGold: (Number(result.data.nowSumGold) || 0) ,
-        nowPermanentGold: (Number(result.data.nowPermanentGold) || 0) ,
-        nowFreeGold: (Number(result.data.nowFreeGold) || 0) ,
-        nowTaskGold: (Number(result.data.nowTaskGold) || 0) 
+        historySumGold: (Number(result.data.historySumGold) || 0),
+        nowSumGold: (Number(result.data.nowSumGold) || 0),
+        nowPermanentGold: (Number(result.data.nowPermanentGold) || 0),
+        nowFreeGold: (Number(result.data.nowFreeGold) || 0),
+        nowTaskGold: (Number(result.data.nowTaskGold) || 0)
       }
       user.value = processedData;
       console.log("用户信息", user.value);
@@ -254,13 +254,13 @@ const getUser = async function (jwcode) {
 
 
 // 退款类型，写死为商品退款
-const refundType = ref([{value: '商品退款', label: '商品退款'}]);
+const refundType = ref([{ value: '商品退款', label: '商品退款' }]);
 
 // 获取退款类型
 // const getRefundTypes = async function () {
 //   try {
 //     // 发送请求获取退款类型
-//     const result = await API({ 
+//     const result = await API({
 //       url: '/refund/refundType', //这里应该写上一个退款类型的接口
 //       data: {} })
 //     console.log('退款类型请求成功', result)
@@ -299,7 +299,7 @@ const getGoods = async function (jwcode) {
   try {
     const result = await API({
       url: '/refund/selectGoods',
-      data: {jwcode: addRefund.value.jwcode}
+      data: { jwcode: addRefund.value.jwcode }
     })
 
     if (Array.isArray(result.data)) {
@@ -307,9 +307,9 @@ const getGoods = async function (jwcode) {
       goodsName.value = result.data.map(item => ({
         orderCode: item.orderCode,
         goodsName: item.goodsName,
-        permanentGold: Math.abs(Number((item.permanentGold) || 0)/100)  ,
-        freeGold: Math.abs(Number((item.freeGold) || 0)/100) ,
-        taskGold: Math.abs(Number((item.taskGold) || 0)/100) ,
+        permanentGold: Math.abs(Number((item.permanentGold) || 0) / 100),
+        freeGold: Math.abs(Number((item.freeGold) || 0) / 100),
+        taskGold: Math.abs(Number((item.taskGold) || 0) / 100),
       }))
 
       // 转换订单号数组 [{label, value}]
@@ -477,7 +477,7 @@ onMounted(async function () {
 </script>
 
 <template>
-  
+  <div>
     <div class="userAndForm">
       <div class="left">
         <el-form :model="addRefund" ref="Ref" :rules="rules" label-width="auto" label-position="right"
@@ -499,57 +499,56 @@ onMounted(async function () {
             </el-select>
           </el-form-item>
 
-        <el-form-item prop="goodsName" label="商品名">
-          <el-input v-model="addRefund.goodsName" style="width: 220px" disabled/>
-        </el-form-item>
-
-
-        <el-form-item prop="refundModel" label="退款方式:">
-          <el-radio-group v-model="addRe.typeR" @change="handleRefundModelChange">
-            <el-radio value="0">全部退款</el-radio>
-            <el-radio value="1">部分退款</el-radio>
-          </el-radio-group>
-        </el-form-item>
-
-        <el-form-item prop="permanentGold" label="永久金币">
-          <el-input v-model="addRefund.permanentGold" style="width: 220px"
-                    :disabled="addRe.typeR === '0' ? true : false" @input="handlePermanentGoldInput($event)"
-                    type="number">
-          </el-input>&nbsp;&nbsp;个
-        </el-form-item>
-
-
-        <el-form-item prop="freeGold" label="免费金币">
-          <el-input v-model="addRefund.freeGold" style="float: left; width: 220px"
-                    :disabled="addRe.typeR === '0' ? true : false" @input="handleFreeGoldInput($event)" type="number"/>
-          &nbsp;&nbsp;个
-        </el-form-item>
-
-        <div>
-          <el-form-item prop="taskGold" label="任务金币">
-            <el-input v-model="addRefund.taskGold" style="float: left; width: 220px"
-                      :disabled="addRe.typeR === '0' ? true : false" @input="handleTaskGoldInput($event)"
-                      type="number"/>
-            &nbsp;&nbsp;个
+          <el-form-item prop="goodsName" label="商品名">
+            <el-input v-model="addRefund.goodsName" style="width: 220px" disabled />
           </el-form-item>
-        </div>
-        <div>
-          <el-form-item prop="sumGold" label="退款金币总数">
-            <el-input disabled v-model="addRefund.sumGold" style="width: 220px">
-            </el-input>
+
+
+          <el-form-item prop="refundModel" label="退款方式:">
+            <el-radio-group v-model="addRe.typeR" @change="handleRefundModelChange">
+              <el-radio value="0">全部退款</el-radio>
+              <el-radio value="1">部分退款</el-radio>
+            </el-radio-group>
           </el-form-item>
-        </div>
-        <div>
 
-          <el-form-item prop="remark" label="备注">
-            <el-input v-model="addRefund.remark" style="width: 220px" :rows="3" maxlength="100" show-word-limit
-                      type="textarea"/>
+          <el-form-item prop="permanentGold" label="永久金币">
+            <el-input v-model="addRefund.permanentGold" style="width: 220px"
+              :disabled="addRe.typeR === '0' ? true : false" @input="handlePermanentGoldInput($event)" type="number">
+            </el-input>&nbsp;&nbsp;个
           </el-form-item>
-        </div>
 
-        <el-button type="success" @click="cancel()" style="margin-left: 200px">重置</el-button>
-        <el-button type="primary" :disabled="addDisabled" @click="addBefore"> 提交</el-button>
-      </el-form>
+
+          <el-form-item prop="freeGold" label="免费金币">
+            <el-input v-model="addRefund.freeGold" style="float: left; width: 220px"
+              :disabled="addRe.typeR === '0' ? true : false" @input="handleFreeGoldInput($event)" type="number" />
+            &nbsp;&nbsp;个
+          </el-form-item>
+
+          <div>
+            <el-form-item prop="taskGold" label="任务金币">
+              <el-input v-model="addRefund.taskGold" style="float: left; width: 220px"
+                :disabled="addRe.typeR === '0' ? true : false" @input="handleTaskGoldInput($event)" type="number" />
+              &nbsp;&nbsp;个
+            </el-form-item>
+          </div>
+          <div>
+            <el-form-item prop="sumGold" label="退款金币总数">
+              <el-input disabled v-model="addRefund.sumGold" style="width: 220px">
+              </el-input>
+            </el-form-item>
+          </div>
+          <div>
+
+            <el-form-item prop="remark" label="备注">
+              <el-input v-model="addRefund.remark" style="width: 220px" :rows="3" maxlength="100" show-word-limit
+                type="textarea" />
+            </el-form-item>
+          </div>
+
+          <el-button type="success" @click="cancel()" style="margin-left: 200px">重置</el-button>
+          <el-button type="primary" :disabled="addDisabled" @click="addBefore"> 提交</el-button>
+        </el-form>
+      </div>
 
       <div class="right">
         <!-- 客户信息栏 -->
@@ -628,13 +627,13 @@ onMounted(async function () {
 </template>
 
 <style scoped lang="scss">
-
 p {
   margin: 0px;
 }
 
 .userAndForm {
   width: 1150px;
+  height: 100%;
   display: flex;
   align-items: center;