YY %!s(int64=2) %!d(string=hai) anos
pai
achega
353b73e6f6

+ 1 - 1
src/views/platActivi/act/index.vue

@@ -52,7 +52,6 @@ export default {
         { label: '删除', method: 'del', confirm: true, type: 'danger' },
       ],
       fields: [
-        { label: '排序', model: 'sort' },
         { label: '活动标题', model: 'act_time.title' },
         {
           label: '活动类型',
@@ -82,6 +81,7 @@ export default {
             else return '暂无';
           },
         },
+        { label: '排序', model: 'sort' },
       ],
       list: [],
       total: 0,

+ 1 - 2
src/views/platActivi/actTags/index.vue

@@ -51,8 +51,6 @@ export default {
       fields: [
         { label: '活动标签', model: 'label' },
         { label: '编码', model: 'value' },
-        { label: '排序', model: 'sort' },
-
         {
           label: '是否正在使用',
           model: 'status',
@@ -80,6 +78,7 @@ export default {
             else return '暂无';
           },
         },
+        { label: '排序', model: 'sort' },
       ],
       list: [],
       total: 0,

+ 1 - 1
src/views/platSettings/config/index.vue

@@ -71,7 +71,6 @@ export default {
       ],
       list: [],
       fieldsList: [
-        { label: '排序', model: 'sort' },
         { label: '名称', model: 'name' },
         { label: '跳转路径', model: 'route' },
         { label: '未选中', model: 'normal[0].name' },
@@ -94,6 +93,7 @@ export default {
             else return '暂无';
           },
         },
+        { label: '排序', model: 'sort' },
       ],
       // 底部菜单表单
       fieldRules: {

+ 37 - 26
src/views/platmanag/goods/index.vue

@@ -1,31 +1,41 @@
 <template>
   <div id="goods">
     <span v-show="view === 'list'">
-      <search-1
-        :form="searchInfo"
-        @onSubmit="search"
-        @querySearch="querySearch"
-        @toReset="toClose"
-        @changeTags="changeTags"
-        :shopList="shopList"
-        :tagsList="tagsList"
-      >
-      </search-1>
-      <data-btn :fields="btnList" @add="toAdd"></data-btn>
-      <data-table
-        ref="dataTable"
-        :fields="fields"
-        :opera="opera"
-        :data="list"
-        :total="total"
-        @query="search"
-        @edit="toEdit"
-        @puton="toPuton"
-        @delete="toDelete"
-        @spec="toSpec"
-        @copy="toCopy"
-      ></data-table>
+      <el-row>
+        <el-col
+          :span="24"
+          class="main animate__animated animate__backInRight"
+          v-loading="loadings"
+          element-loading-text="拼命加载中"
+          element-loading-spinner="el-icon-loading"
+        >
+          <search-1
+            :form="searchInfo"
+            @onSubmit="search"
+            @querySearch="querySearch"
+            @toReset="toClose"
+            @changeTags="changeTags"
+            :shopList="shopList"
+            :tagsList="tagsList"
+          >
+          </search-1>
+          <data-btn :fields="btnList" @add="toAdd"></data-btn>
+          <data-table
+            ref="dataTable"
+            :fields="fields"
+            :opera="opera"
+            :data="list"
+            :total="total"
+            @query="search"
+            @edit="toEdit"
+            @puton="toPuton"
+            @delete="toDelete"
+            @spec="toSpec"
+            @copy="toCopy"
+          ></data-table> </el-col
+      ></el-row>
     </span>
+
     <el-row v-if="view === 'info'">
       <el-col :span="24" style="margin: 0 0 10px 0">
         <el-col :span="2"><el-button type="primary" size="mini" @click="toBack()">返回</el-button></el-col>
@@ -107,14 +117,15 @@ export default {
   components: { editor: () => import('@/components/editor.vue'), search1: () => import('./parts/search-1.vue') },
   data: function () {
     return {
+      loadings: true,
       view: 'list',
       fields: [
-        { label: '排序', model: 'sort' },
         { label: '商品名称', model: 'name', showTip: false },
         { label: '店铺名称', model: 'shop.name' },
         { label: '商品分类', model: 'tags', format: (i) => this.getTags(i), showTip: false },
         { label: '活动标签', model: 'act_tags', format: (i) => this.getAct_tags(i) },
         { label: '商品状态', model: 'status', format: (i) => this.getStatus(i) },
+        { label: '排序', model: 'sort' },
       ],
       opera: [
         { label: '修改', method: 'edit' },
@@ -190,6 +201,7 @@ export default {
         this.$set(this, `list`, res.data);
         this.$set(this, `total`, res.total);
       }
+      this.loadings = false;
     },
     // 去编辑
     async toEdit({ data }) {
@@ -266,7 +278,6 @@ export default {
     },
     // 查询其他信息
     async searchOthers() {
-
       let res = await this.tree();
       if (this.$checkRes(res)) this.$set(this, `tagsList`, res.data);
       // 商品状态

+ 1 - 1
src/views/platmanag/goods/spec.vue

@@ -61,7 +61,6 @@ export default {
     return {
       view: 'list',
       fields: [
-        { label: '排序', model: 'sort' },
         { label: '规格名称', model: 'name', showTip: false },
         { label: '库存', model: 'num' },
         { label: '实际销售价格', model: 'sell_money' },
@@ -79,6 +78,7 @@ export default {
         },
         { label: '团购金额', model: 'group_config.money' },
         { label: '开团人数', model: 'group_config.need_person' },
+        { label: '排序', model: 'sort' },
       ],
       opera: [
         { label: '修改', method: 'edit' },

+ 30 - 19
src/views/platmanag/goodsTags/index.vue

@@ -2,28 +2,37 @@
   <div id="index">
     <span v-if="view === 'list'">
       <el-row>
-        <el-col :span="24" class="btn" v-if="levelList.length > 0">
-          <el-col :span="2">
-            <el-button size="mini" type="primary" @click="backLevel()">返回</el-button>
-          </el-col>
-          <el-col :span="20">
-            <el-breadcrumb separator-class="el-icon-arrow-right">
-              <el-breadcrumb-item v-for="(item, index) in data" :key="index">{{ item.label }}({{ item.code }})</el-breadcrumb-item>
-            </el-breadcrumb>
+        <el-col
+          :span="24"
+          class="main animate__animated animate__backInRight"
+          v-loading="loadings"
+          element-loading-text="拼命加载中"
+          element-loading-spinner="el-icon-loading"
+        >
+          <el-col :span="24" class="btn" v-if="levelList.length > 0">
+            <el-col :span="2">
+              <el-button size="mini" type="primary" @click="backLevel()">返回</el-button>
+            </el-col>
+            <el-col :span="20">
+              <el-breadcrumb separator-class="el-icon-arrow-right">
+                <el-breadcrumb-item v-for="(item, index) in data" :key="index">{{ item.label }}({{ item.code }})</el-breadcrumb-item>
+              </el-breadcrumb>
+            </el-col>
           </el-col>
+
+          <data-search :fields="searchFields" v-model="searchInfo" @query="search">
+            <template #status>
+              <el-option v-for="i in statusList" :key="i.model" :label="i.label" :value="i.value"></el-option>
+            </template>
+          </data-search>
+          <data-btn :fields="btnFields" @add="toAdd" />
+          <data-table ref="dataTable" :fields="fields" :opera="opera" :data="list" :total="total" @edit="toEdit" @delete="toDelete" @query="search">
+            <template #code="{ row, item }">
+              <el-link type="primary" @click="toData(row)">{{ row[item.model] }}</el-link>
+            </template>
+          </data-table>
         </el-col>
       </el-row>
-      <data-search :fields="searchFields" v-model="searchInfo" @query="search">
-        <template #status>
-          <el-option v-for="i in statusList" :key="i.model" :label="i.label" :value="i.value"></el-option>
-        </template>
-      </data-search>
-      <data-btn :fields="btnFields" @add="toAdd" />
-      <data-table ref="dataTable" :fields="fields" :opera="opera" :data="list" :total="total" @edit="toEdit" @delete="toDelete" @query="search">
-        <template #code="{ row, item }">
-          <el-link type="primary" @click="toData(row)">{{ row[item.model] }}</el-link>
-        </template>
-      </data-table>
     </span>
     <el-row v-if="view === 'info'">
       <el-col :span="24">
@@ -52,6 +61,7 @@ export default {
   components: {},
   data: function () {
     return {
+      loadings: true,
       view: 'list',
       fields: [
         { label: '显示名称', model: 'label' },
@@ -111,6 +121,7 @@ export default {
         this.$set(this, `list`, res.data);
         this.$set(this, `total`, res.total);
       }
+      this.loadings = false;
     },
     async searchOthers() {
       const res = await this.getDict({ code: 'use' });

+ 42 - 31
src/views/selfShop/goods/index.vue

@@ -1,36 +1,45 @@
 <template>
   <div id="goods">
     <span v-show="view === 'list'">
-      <data-search :fields="searchFields" v-model="searchInfo" @query="search">
-        <template #status>
-          <el-option v-for="i in goodsStatusList" :key="i.value" :label="i.label" :value="i.value"></el-option>
-        </template>
-        <template #tags="{ item }">
-          <el-cascader
-            v-model="searchInfo[item.model]"
-            :options="tagsList"
-            :props="propss"
-            clearable
-            filterable
-            :show-all-levels="false"
-            @change="changeTags"
-          ></el-cascader>
-        </template>
-      </data-search>
-      <data-btn :fields="btnList" @add="toAdd"></data-btn>
-      <data-table
-        ref="dataTable"
-        :fields="fields"
-        :opera="opera"
-        :data="list"
-        :total="total"
-        @query="search"
-        @edit="toEdit"
-        @puton="toPuton"
-        @delete="toDelete"
-        @spec="toSpec"
-        @copy="toCopy"
-      ></data-table>
+      <el-row>
+        <el-col
+          :span="24"
+          class="main animate__animated animate__backInRight"
+          v-loading="loadings"
+          element-loading-text="拼命加载中"
+          element-loading-spinner="el-icon-loading"
+        >
+          <data-search :fields="searchFields" v-model="searchInfo" @query="search">
+            <template #status>
+              <el-option v-for="i in goodsStatusList" :key="i.value" :label="i.label" :value="i.value"></el-option>
+            </template>
+            <template #tags="{ item }">
+              <el-cascader
+                v-model="searchInfo[item.model]"
+                :options="tagsList"
+                :props="propss"
+                clearable
+                filterable
+                :show-all-levels="false"
+                @change="changeTags"
+              ></el-cascader>
+            </template>
+          </data-search>
+          <data-btn :fields="btnList" @add="toAdd"></data-btn>
+          <data-table
+            ref="dataTable"
+            :fields="fields"
+            :opera="opera"
+            :data="list"
+            :total="total"
+            @query="search"
+            @edit="toEdit"
+            @puton="toPuton"
+            @delete="toDelete"
+            @spec="toSpec"
+            @copy="toCopy"
+          ></data-table> </el-col
+      ></el-row>
     </span>
     <el-row v-if="view === 'info'">
       <el-col :span="24" style="margin: 0 0 10px 0">
@@ -99,14 +108,15 @@ export default {
   },
   data: function () {
     return {
+      loadings: true,
       view: 'list',
       fields: [
-        { label: '排序', model: 'sort' },
         { label: '商品名称', model: 'name', showTip: false },
         { label: '店铺名称', model: 'shop.name' },
         { label: '商品分类', model: 'tags', format: (i) => this.getTags(i) },
         { label: '活动标签', model: 'act_tags', format: (i) => this.getAct_tags(i) },
         { label: '商品状态', model: 'status', format: (i) => this.getStatus(i) },
+        { label: '排序', model: 'sort' },
       ],
       opera: [
         { label: '修改', method: 'edit' },
@@ -179,6 +189,7 @@ export default {
         this.$set(this, `list`, res.data);
         this.$set(this, `total`, res.total);
       }
+      this.loadings = false;
     },
     // 去编辑
     async toEdit({ data }) {

+ 1 - 1
src/views/selfShop/goods/spec.vue

@@ -62,7 +62,6 @@ export default {
     return {
       view: 'list',
       fields: [
-        { label: '排序', model: 'sort' },
         { label: '规格名称', model: 'name', showTip: false },
         { label: '库存', model: 'num' },
         { label: '实际销售价格', model: 'sell_money' },
@@ -80,6 +79,7 @@ export default {
         },
         { label: '团购金额', model: 'group_config.money' },
         { label: '开团人数', model: 'group_config.need_person' },
+        { label: '排序', model: 'sort' },
       ],
       opera: [
         { label: '修改', method: 'edit' },

+ 1 - 1
src/views/zr/zrGoods/index.vue

@@ -62,11 +62,11 @@ export default {
       loadings: true,
       view: 'list',
       fields: [
-        { label: '排序', model: 'sort' },
         { label: '商品名称', model: 'name', showTip: false },
         { label: '店铺名称', model: 'shop.name' },
         { label: '商品库存', model: 'num' },
         { label: '商品状态', model: 'status', format: (i) => this.getStatus(i) },
+        { label: '排序', model: 'sort' },
       ],
       opera: [
         { label: '修改', method: 'edit' },