浏览代码

优化部分功能

zhengjinyi 5 年之前
父节点
当前提交
d938aa11f8

+ 7 - 6
src/views/club/form.vue

@@ -171,12 +171,13 @@ export default {
           this.loadingbut = true
           this.loadingbuttext = '保存中...'
           saveAddClubUser(params).then(response => {
-            if (response.code === '1') {
-              this.loadingbut = false
-              this.loadingbuttext = '保存'
-              this.$message({ message: '上线会所成功', type: 'success', center: true })
-              this.backToList()
-            }
+            this.loadingbut = false
+            this.loadingbuttext = '保存'
+            this.$message({ message: '上线会所成功', type: 'success', center: true })
+            this.backToList()
+          }).catch(() => {
+            this.loadingbut = false
+            this.loadingbuttext = '保存'
           })
         }
       })

+ 8 - 5
src/views/goods/category-create.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" style="padding-top:0;">
     <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal">
       <el-menu-item index="1" @click="backToList">商品分类</el-menu-item>
       <el-menu-item index="2">添加分类</el-menu-item>
@@ -44,6 +44,9 @@
         </el-select>
       </el-form-item>
       <el-form-item>
+        <router-link :to="{path:'/goods/category'}">
+          <el-button type="primary" plain style="margin-right:10px">返回</el-button>
+        </router-link>
         <el-button type="primary" @click="updateData">提交</el-button>
       </el-form-item>
     </el-form>
@@ -142,7 +145,10 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="scss">
+.form-el-upload{
+  width: 150px;
+}
 .avatar-uploader .el-upload {
   border: 1px dashed #d9d9d9;
   border-radius: 6px;
@@ -170,9 +176,6 @@ export default {
 .el-form-item__label{
     text-align: right !important;
 }
-.form-el-upload{
-  width: 150px;
-}
 .el-upload__tip{
   margin-top: 0;
   line-height: 20px;

+ 5 - 2
src/views/goods/category-edit.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" style="padding-top:0;">
     <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal">
       <el-menu-item index="1" @click="backToList">商品分类</el-menu-item>
       <el-menu-item index="2">编辑分类</el-menu-item>
@@ -44,6 +44,9 @@
         </el-select>
       </el-form-item>
       <el-form-item>
+        <router-link :to="{path:'/goods/category'}">
+          <el-button type="primary" plain style="margin-right:10px">返回</el-button>
+        </router-link>
         <el-button type="primary" @click="updateData">提交</el-button>
       </el-form-item>
     </el-form>
@@ -153,7 +156,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="scss">
   .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
     border-radius: 6px;

+ 3 - 3
src/views/goods/list-commonly.vue

@@ -53,7 +53,7 @@
       :header-cell-style="{background:'#eef1f6',color:'#606266'}"
       style="width:100%;margin-top:20px;"
     >
-      <el-table-column align="center" label="序号" width="50px">
+      <el-table-column align="center" label="序号" width="40px">
         <template slot-scope="scope">
           {{ ((pageNum-1)*listQuery.pageSize)+scope.$index+1 }}
         </template>
@@ -68,7 +68,7 @@
       <el-table-column label="供应商" align="center" prop="shopName" min-width="120px" />
       <el-table-column label="市场价" align="center" prop="normalPrice" />
       <el-table-column label="成本价" align="center" prop="costPrice" />
-      <el-table-column label="售价" align="center" prop="retailPrice" />
+      <el-table-column label="售价" align="center" prop="retailPrice" width="70" />
       <el-table-column label="起订量" align="center" prop="minBuyNumber" />
       <el-table-column label="商品分类" align="center" prop="productClassifyName" />
       <el-table-column align="center" label="添加时间" prop="addTime">
@@ -83,7 +83,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" style="width: 80px;margin:5px 0 0 0;" @click="cancelGoods(row)">取消</el-button>
+          <el-button type="primary" size="mini" style="width: 70px;margin:5px 0 0 0;" @click="cancelGoods(row)">取消</el-button>
         </template>
       </el-table-column>
     </el-table>

+ 2 - 2
src/views/goods/list-preferential.vue

@@ -53,7 +53,7 @@
       :header-cell-style="{background:'#eef1f6',color:'#606266'}"
       style="width:100%;margin-top:20px;"
     >
-      <el-table-column align="center" label="序号" width="50px">
+      <el-table-column align="center" label="序号" width="40px">
         <template slot-scope="scope">
           {{ ((pageNum-1)*listQuery.pageSize)+scope.$index+1 }}
         </template>
@@ -83,7 +83,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" style="width: 80px;margin:5px 0 0 0;" @click="cancelGoods(row)">取消</el-button>
+          <el-button type="primary" size="mini" style="width: 70px;margin:5px 0 0 0;" @click="cancelGoods(row)">取消</el-button>
         </template>
       </el-table-column>
     </el-table>

+ 2 - 2
src/views/goods/list-preferred.vue

@@ -53,7 +53,7 @@
       :header-cell-style="{background:'#eef1f6',color:'#606266'}"
       style="width:100%;margin-top:20px;"
     >
-      <el-table-column align="center" label="序号" width="50px">
+      <el-table-column align="center" label="序号" width="40px">
         <template slot-scope="scope">
           {{ ((pageNum-1)*listQuery.pageSize)+scope.$index+1 }}
         </template>
@@ -83,7 +83,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" style="width: 80px;margin:5px 0 0 0;" @click="cancelGoods(row)">取消</el-button>
+          <el-button type="primary" size="mini" style="width: 70px;margin:5px 0 0 0;" @click="cancelGoods(row)">取消</el-button>
         </template>
       </el-table-column>
     </el-table>

+ 5 - 12
src/views/order/list.vue

@@ -17,20 +17,20 @@
         <el-form-item class="date-box" label="下单时间:" style="width:405px;float: left;">
           <el-date-picker
             v-model="listQuery.startTime"
-            style="width:150px"
+            style="width:150px;margin-bottom: 10px;"
             type="date"
             placeholder="请选择日期"
-            format="yyyy/MM/dd"
+            format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
             @change="handleFilter"
           />
           <el-date-picker
             v-model="listQuery.endTime"
-            style="width:150px"
+            style="width:150px;margin-bottom: 10px;"
             type="date"
             placeholder="请选择日期"
-            format="yyyy/MM/dd"
+            format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
             @change="handleFilter"
           />
@@ -96,11 +96,6 @@
       highlight-current-row
       :header-cell-style="{background:'#eef1f6',color:'#606266'}"
     >
-      <el-table-column align="center" label="序号" width="50">
-        <template slot-scope="scope">
-          {{ ((pageNum-1)*listQuery.pageSize)+scope.$index+1 }}
-        </template>
-      </el-table-column>
       <el-table-column label="订单ID" align="center" prop="orderID" />
       <el-table-column label="订单编号" align="center" prop="orderNo" />
       <el-table-column label="买家" align="center" prop="buyer" />
@@ -198,7 +193,6 @@ export default {
   components: { Pagination, Remarks },
   data() {
     return {
-      pageNum: 0,
       list: null,
       listLoading: true,
       total: 0,
@@ -254,7 +248,6 @@ export default {
       getList(this.listQuery).then(response => {
         this.list = response.data.results
         this.total = response.data.totalRecord
-        this.pageNum = response.data.index
         this.listLoading = false
       }).catch(() => {
         this.listLoading = false
@@ -276,7 +269,7 @@ export default {
 
 <style scoped>
   .el-form-item{
-    margin-bottom: 0;
+    margin-bottom: 0
   }
   .date-box{
     margin-right:0;

+ 2 - 2
src/views/order/refund.vue

@@ -27,7 +27,7 @@
             style="width:150px"
             type="date"
             placeholder="请选择时间"
-            format="yyyy/MM/dd"
+            format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
             @change="handleFilter"
           />
@@ -37,7 +37,7 @@
             style="width:150px"
             type="date"
             placeholder="请选择时间"
-            format="yyyy/MM/dd"
+            format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
             @change="handleFilter"
           />