1231233

.env.development

@@ -22,4 +22,4 @@ VUE_APP_XXL_JOB_ADMIN = 'http://localhost:9100/xxl-job-admin'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 
-VUE_APP_LOGO_PRE = 'leyan'
+VUE_APP_LOGO_PRE = 'qiumu'

src/views/cai/payTrdConfig/pay-trd-config-add-or-update-dialog.vue

@@ -121,9 +121,6 @@ export default {
         name: [
           { required: true, message: "支付名称不能为空", trigger: "blur" }
         ],
-        notifyUrl: [
-          { required: true, message: "回调域名不能为空", trigger: "blur" }
-        ],
         mchId: [
           { required: true, message: "商户ID不能为空", trigger: "blur" }
         ],

src/views/cai/pointChangeLog/draw-winning-record-tabs.vue

@@ -52,6 +52,7 @@
     </el-form>
 
     <el-table v-loading="loading" :data="prizeWinningRecordList" @selection-change="handleSelectionChange">
+      <el-table-column label="抽奖时间" align="center" prop="createTime" width="140"/>
       <el-table-column :label="systemName+'号'" align="center" prop="usercode"/>
       <el-table-column label="手机号" align="center" prop="mobile"/>
       <el-table-column label="昵称" align="center" prop="nickname"/>
@@ -67,9 +68,6 @@
           <image-avatar :src="scope.row.prizeImg"/>
         </template>
       </el-table-column>
-      <el-table-column label="中奖率" align="center" prop="winProbability" />
-      <el-table-column label="保底抽数" align="center" prop="guaranteeDraws" />
-      <el-table-column label="最低抽数" align="center" prop="minWinDraws" />
       <el-table-column label="奖品价值" align="center" prop="prizePrice" />
       <el-table-column label="自动兑奖" align="center" prop="autoGive" >
         <template v-slot="scope">
@@ -78,11 +76,14 @@
       </el-table-column>
       <el-table-column label="状态" align="center" prop="giveStatus" >
         <template v-slot="scope">
-          <cai-dict-tag :options="winningRecordGiveStatusList" :value="scope.row.autoGive" />
+          <cai-dict-tag :options="winningRecordGiveStatusList" :value="scope.row.giveStatus" />
         </template>
       </el-table-column>
-      <el-table-column label="兑奖备注说明" align="center" prop="giveRemark" />
+      <el-table-column label="兑奖备注" align="center" prop="giveRemark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="中奖率" align="center" prop="winProbability" />
+      <el-table-column label="保底抽数" align="center" prop="guaranteeDraws" />
+      <el-table-column label="最低抽数" align="center" prop="minWinDraws" />
+      <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -189,6 +190,7 @@ export default {
           giveRemark: value,
         }).then(response => {
           this.$modal.msgSuccess("修改成功");
+          this.getList();
         });
       }).catch(() => {});
     },

src/views/cai/prizeInfo/index.vue

@@ -5,10 +5,10 @@
         <prize-info-tab business-type="prizeInfoTab" />
       </el-tab-pane>
       <el-tab-pane label="男用户奖品" name="prizeOnlineManTab">
-        <prize-online-man-tab business-type="prizeOnlineManTab" :gender="1" />
+        <prize-online-man-tab business-type="prizeOnlineManTab" :gender="2" />
       </el-tab-pane>
       <el-tab-pane label="女用户奖品" name="pay">
-        <prize-online-man-tab business-type="prizeOnlineManTab" :gender="2" />
+        <prize-online-man-tab business-type="prizeOnlineManTab" :gender="1" />
       </el-tab-pane>
     </el-tabs>
   </div>

src/views/cai/prizeInfo/prize-info-tab.vue

@@ -45,17 +45,6 @@
           v-hasPermi="['cai:prizeInfo:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['cai:prizeInfo:edit']"
-        >修改</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -96,6 +85,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
+              v-if="scope.row.id != 1"
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -103,6 +93,7 @@
             v-hasPermi="['cai:prizeInfo:edit']"
           >修改</el-button>
           <el-button
+              v-if="scope.row.id != 1"
             size="mini"
             type="text"
             icon="el-icon-delete"

src/views/cai/prizeInfo/prize-online-reset-dialog.vue

@@ -40,6 +40,7 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
+                v-if="scope.row.prizeId != 1"
                 size="mini"
                 type="text"
                 icon="el-icon-edit"
@@ -47,6 +48,7 @@
                 v-hasPermi="['cai:prizeInfo:edit']"
             >修改</el-button>
             <el-button
+                v-if="scope.row.prizeId != 1"
                 size="mini"
                 type="text"
                 icon="el-icon-delete"