丽格后台v1.0.2改版测试

.env.development

@@ -5,8 +5,8 @@ ENV = 'development'
 # VUE_APP_BASE_API = '/dev-api'
 # VUE_APP_BASE_API = 'http://192.168.1.22:9104'
 # VUE_APP_BASE_API = 'http://192.168.2.67:9104'
-# VUE_APP_BASE_API = 'https://mai-b.caimei365.com'
-VUE_APP_BASE_API = 'http://192.168.2.103:9104'
+VUE_APP_BASE_API = 'https://mai-b.caimei365.com'
+# VUE_APP_BASE_API = 'http://192.168.2.103:9104'
 # VUE_APP_BASE_API = 'http://192.168.78.1:9104/'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,

src/views/campaign/activity-edit.vue

@@ -41,7 +41,7 @@
             <el-table-column property="productName" label="商品名称" align="center" />
             <el-table-column prop="validFlag" label="商品状态" align="center" width="150">
               <template slot-scope="{row}">
-                <el-tag :type="row.validFlag | statusFilter">{{ row.validFlag*1 === 1 ? '已上架' : '已下架' }}</el-tag>
+                <el-tag :type="row.validFlag | statusFilter">{{ row.validFlag*1 === 2 ? '已上架' : '已下架' }}</el-tag>
               </template>
             </el-table-column>
             <el-table-column prop="sort" label="排序" align="center" width="100">
@@ -97,7 +97,7 @@
               <el-table-column property="productName" label="商品名称" align="center" />
               <el-table-column prop="validFlag" label="商品状态" align="center" width="150">
                 <template slot-scope="{row}">
-                  <el-tag :type="row.validFlag | statusFilter">{{ row.validFlag*1 === 1 ? '已上架' : '已下架' }}</el-tag>
+                  <el-tag :type="row.validFlag | statusFilter">{{ row.validFlag*1 === 2 ? '已上架' : '已下架' }}</el-tag>
                 </template>
               </el-table-column>
               <el-table-column label="排序" align="center" width="100">
@@ -157,7 +157,7 @@
               <el-table-column property="productName" label="商品名称" align="center" />
               <el-table-column prop="validFlag" label="商品状态" align="center" width="150">
                 <template slot-scope="{row}">
-                  <el-tag :type="row.validFlag | statusFilter">{{ row.validFlag*1 === 1 ? '已上架' : '已下架' }}</el-tag>
+                  <el-tag :type="row.validFlag | statusFilter">{{ row.validFlag*1 === 2 ? '已上架' : '已下架' }}</el-tag>
                 </template>
               </el-table-column>
               <el-table-column label="排序" align="center" width="100">

src/views/campaign/banner-edit.vue

@@ -61,7 +61,7 @@
               <el-table-column prop="productName" label="商品名称" align="center" width="300" />
               <el-table-column prop="validFlag" label="商品状态" align="center" width="150">
                 <template slot-scope="{row}">
-                  <el-tag :type="row.validFlag | statusFilter">{{ row.validFlag*1 === 1 ? '已上架' : '已下架' }}</el-tag>
+                  <el-tag :type="row.validFlag | statusFilter">{{ row.validFlag*1 === 2 ? '已上架' : '已下架' }}</el-tag>
                 </template>
               </el-table-column>
               <el-table-column label="操作" align="center">

src/views/campaign/category-edit.vue

@@ -61,7 +61,7 @@
               <el-table-column prop="productName" label="商品名称" align="center" width="300" />
               <el-table-column prop="validFlag" label="商品状态" align="center" width="150">
                 <template slot-scope="{row}">
-                  <el-tag :type="row.validFlag | statusFilter">{{ row.validFlag*1 === 1 ? '已上架' : '已下架' }}</el-tag>
+                  <el-tag :type="row.validFlag | statusFilter">{{ row.validFlag*1 === 2 ? '已上架' : '已下架' }}</el-tag>
                 </template>
               </el-table-column>
               <el-table-column label="操作" align="center">

src/views/campaign/components/good-dialog.vue

@@ -81,7 +81,7 @@ export default {
       listQuery: {
         productName: '', // 商品名称
         shopName: '', // 供应商名称
-        validFlag: 1,
+        validFlag: 2,
         index: 1,
         organizeId: this.$store.getters.organizeId,
         pageSize: 10

src/views/campaign/special-edit.vue

@@ -58,7 +58,7 @@
               <el-table-column prop="productName" label="商品名称" align="center" width="300" />
               <el-table-column prop="validFlag" label="商品状态" align="center" width="150">
                 <template slot-scope="{row}">
-                  <el-tag :type="row.validFlag | statusFilter">{{ row.validFlag*1 === 1 ? '已上架' : '已下架' }}</el-tag>
+                  <el-tag :type="row.validFlag | statusFilter">{{ row.validFlag*1 === 2 ? '已上架' : '已下架' }}</el-tag>
                 </template>
               </el-table-column>
               <el-table-column label="操作" align="center">

src/views/floor/components/good-multi-dialog.vue

@@ -81,7 +81,7 @@ export default {
       listQuery: {
         productName: '', // 商品名称
         shopName: '', // 供应商名称
-        validFlag: 1,
+        validFlag: 2,
         index: 1,
         organizeId: this.$store.getters.organizeId,
         pageSize: 10

src/views/floor/edit.vue

@@ -35,7 +35,7 @@
           <el-table-column property="productName" label="商品名称" align="center" />
           <el-table-column prop="validFlag" label="商品状态" align="center" width="150">
             <template slot-scope="{row}">
-              <el-tag :type="row.validFlag | statusFilter">{{ row.validFlag*1 === 1 ? '已上架' : '已下架' }}</el-tag>
+              <el-tag :type="row.validFlag | statusFilter">{{ row.validFlag*1 === 2 ? '已上架' : '已下架' }}</el-tag>
             </template>
           </el-table-column>
           <el-table-column prop="sort" label="排序" align="center" width="100">

src/views/goods/components/price-edit.vue

@@ -20,8 +20,8 @@
       </el-form-item>
       <el-form-item label="商品状态:" prop="validFlag">
         <el-select v-model="formData.validFlag" placeholder="请选择" disabled="true" @change="handleChange($event)">
-          <el-option label="已上架" :value="1" />
-          <el-option label="已下架" :value="2" />
+          <el-option label="已上架" :value="2" />
+          <el-option label="已下架" :value="3" />
         </el-select>
       </el-form-item>
       <el-form-item label="商品规格:" prop="skus">

src/views/goods/list.vue

@@ -34,8 +34,8 @@
           @change="getList"
         >
           <el-option label="所有" value="" />
-          <el-option label="已上架" value="1" />
-          <el-option label="已下架" value="2" />
+          <el-option label="已上架" value="2" />
+          <el-option label="已下架" value="3" />
         </el-select>
       </div>
       <div class="filter-control">
@@ -97,7 +97,7 @@
       >
         <template slot-scope="{ row }">
           <el-tag :type="row.validFlag | statusFilter">{{
-            row.validFlag * 1 === 1 ? "已上架" : "已下架"
+            row.validFlag * 1 === 2 ? "已上架" : "已下架"
           }}</el-tag>
         </template>
       </el-table-column>
@@ -114,10 +114,10 @@
             @click="handleEdit(row)"
           >查看详情</el-button>
           <el-button
-            :type="row.validFlag * 1 === 1 ? 'warning' : 'primary'"
+            :type="row.validFlag * 1 === 2 ? 'warning' : 'primary'"
             size="mini"
             @click="handleSwitch(row)"
-          >{{ row.validFlag * 1 === 1 ? "下架" : "上架" }}</el-button>
+          >{{ row.validFlag * 1 === 2 ? "下架" : "上架" }}</el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/order/list.vue

@@ -186,12 +186,12 @@
           <el-tag v-else type="info" size="small">无退款</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="待审核退款" align="center" prop="returnedPurchaseStatus">
+      <!-- <el-table-column label="待审核退款" align="center" prop="returnedPurchaseStatus">
         <template slot-scope="{row}">
           <el-tag v-if="row.returnedPurchaseStatus*1===1" type="warning" size="small">有</el-tag>
           <el-tag v-else type="info" size="small">无</el-tag>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="订单金额" align="center" prop="payTotalFee">
         <template slot-scope="{row}">
           ¥{{ row.payTotalFee | toThousandFloatFilter }}

src/views/order/refund.vue

@@ -101,6 +101,7 @@
       <el-table-column label="操作" align="center">
         <template slot-scope="{row}">
           <el-button type="primary" size="mini" @click="handleDetailes(row)">查看详情</el-button>
+          <el-button type="warning" size="mini" @click="revokeRefund(row)">撤销退款</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -171,6 +172,18 @@ export default {
     },
     handleDetailes(row) {
       this.$router.push({ path: '/order/refund-detail', query: { id: row.id }})
+    },
+    revokeRefund(row) {
+      this.$confirm('确定撤销本次退款吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$message({
+          type: 'success',
+          message: '撤销成功!'
+        })
+      }).catch(() => {})
     }
   }
 }