Переглянути джерело

修复开发记录发卡时间为时间戳的问题

udream-cxs 4 роки тому
батько
коміт
e679febbaf

+ 4 - 4
src/apps/mobile/components/header/leftside.vue

@@ -265,14 +265,14 @@
           </template>
       </el-menu-item>
 
-      <!-- <el-submenu index="/authority" v-if="menuList.authority">
+      <el-submenu index="/authority" v-if="menuList.authority">
           <template slot="title">
               <i class="el-icon-s-check"></i>
               <span style="font-size: 16px;">权限管理</span>
           </template>
           <el-menu-item index="/authority/app-menu">app菜单管理</el-menu-item>
-          <el-menu-item index="/authority/web-menu">web菜单管理</el-menu-item>
-      </el-submenu> -->
+          <!-- <el-menu-item index="/authority/web-menu">web菜单管理</el-menu-item> -->
+      </el-submenu>
 
 
       <el-submenu index="/personnel" v-if="menuList.personnel">
@@ -340,7 +340,7 @@ export default {
         payment: false,
         sensitiveWord: false,
         shop: false,
-        authority: false,
+        authority: true,
         personnel: false
       },
       Enterprise:{

+ 1 - 1
src/apps/mobile/views/card-bank/approve/index.vue

@@ -8,7 +8,7 @@
                         <el-col :span="4">
                             <el-form-item>
                                 <el-select placeholder="请选择卡券类型" v-model="searchForm.type">
-                                    <el-option label="折扣" :value="1"></el-option>
+                                    <el-option label="折扣" :value="1"></el-option>
                                     <el-option label="红包" :value="2"></el-option>
                                 </el-select>
                             </el-form-item>

+ 3 - 3
src/apps/mobile/views/card-bank/components/addEditDialog.vue

@@ -8,7 +8,7 @@
                 <el-form-item label="类型:" prop="type" v-if="this.addOrEditor === 'add'">
                     <el-select v-model="addEditDialogForm.type">
                         <el-option label="红包" :value="2"></el-option>
-                        <el-option label="折扣" :value="1"></el-option>
+                        <el-option label="折扣" :value="1"></el-option>
                     </el-select>
                 </el-form-item>
                 <!-- <el-form-item label="使用范围" prop="scenario">
@@ -27,10 +27,10 @@
                 <el-form-item label="总额:" prop="totalPrice" v-if="addEditDialogForm.type === 2">
                     <el-input class="file-input" disabled :value="totalPrice"></el-input>
                 </el-form-item>
-                <el-form-item label="折扣:" prop="discount" v-if="addEditDialogForm.type === 1">
+                <el-form-item label="折扣金额:" prop="discount" v-if="addEditDialogForm.type === 1">
                     <el-input placeholder="请输入" v-model="addEditDialogForm.discount" class="file-input"></el-input>
                 </el-form-item>
-                <el-form-item label="满减:" prop="fullReduction" v-if="addEditDialogForm.type === 1">
+                <el-form-item label="满减金额:" prop="fullReduction" v-if="addEditDialogForm.type === 1">
                     <el-input placeholder="请输入" v-model="addEditDialogForm.fullReduction" class="file-input"></el-input>
                 </el-form-item>
                 <el-form-item label="有效期:" prop="validity" v-if="addEditDialogForm.type === 1">

+ 10 - 2
src/apps/mobile/views/card-bank/history/index.vue

@@ -54,8 +54,16 @@
                             <span>{{scope.row.usedFlag | couponUsedFlagPipe}}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="createTime" label="发放时间"></el-table-column>
-                    <el-table-column prop="updateTime" label="使用时间"></el-table-column>
+                    <el-table-column prop="createTime" label="发放时间">
+                        <template slot-scope="scope">
+                            <span>{{scope.row.createTime | formatTimePipe }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="updateTime" label="使用时间">
+                        <template slot-scope="scope">
+                            <span>{{scope.row.updateTime | formatTimePipe }}</span>
+                        </template>
+                    </el-table-column>
                     <!-- <el-table-column prop="scenario" label="使用范围">
                         <template slot-scope="scope">
                             <span>{{scope.row.scenario | couponUsePipe}}</span>

+ 1 - 1
src/apps/mobile/views/card-bank/index.vue

@@ -8,7 +8,7 @@
                         <el-col :span="4">
                             <el-form-item>
                                 <el-select placeholder="请选择类型" v-model="searchForm.type">
-                                    <el-option label="折扣" :value="1"></el-option>
+                                    <el-option label="折扣" :value="1"></el-option>
                                     <el-option label="红包" :value="2"></el-option>
                                 </el-select>
                             </el-form-item>