Acasă Explorează Ajutor
Înregistrare Autentificare
zhh
/
front-end
1
0
Bifurcare 0
Fisiere Probleme 0 Trageți solicitările 0 Wiki
Răsfoiți Sursa

平台pc端-商家列表以及绑定供货商处理无法进行分页、搜索

jf 5 ani în urmă
părinte
41f8002e0c
comite
384f905b11
19 a modificat fișierele cu 20 adăugiri și 21 ștergeri
Vizualizare divizată Arată Statisticile Diff
  1. 1 1
      hd/src/views/item/list.vue
  2. 0 0
      pt/dist/web/css/chunk-02addfa6.14b5db3a.css
  3. 0 0
      pt/dist/web/css/chunk-cf9a98d2.38477d04.css
  4. 1 1
      pt/dist/web/index.html
  5. 0 0
      pt/dist/web/js/app.747a879d.js
  6. 0 0
      pt/dist/web/js/app.9bc7bd1a.js
  7. 0 0
      pt/dist/web/js/chunk-0044508d.4f1a5c0e.js
  8. 0 0
      pt/dist/web/js/chunk-0044508d.89d096a5.js
  9. 0 0
      pt/dist/web/js/chunk-02addfa6.701729f3.js
  10. 0 0
      pt/dist/web/js/chunk-04e2da8e.9d511230.js
  11. 0 0
      pt/dist/web/js/chunk-22bc7a56.cb4a17c8.js
  12. 0 1
      pt/dist/web/js/chunk-2d0baa68.a26d0ee3.js
  13. 0 0
      pt/dist/web/js/chunk-5c48017e.b694eb36.js
  14. 0 0
      pt/dist/web/js/chunk-6fbc11da.d460e9d7.js
  15. 0 0
      pt/dist/web/js/chunk-cf9a98d2.573eaa03.js
  16. 2 9
      pt/src/components/module/sj-list-layer.vue
  17. 3 1
      pt/src/cool/request/index.js
  18. 12 8
      pt/src/saas/shop/list.vue
  19. 1 0
      pt/src/service/merchant/index.js

+ 1 - 1
hd/src/views/item/list.vue
Vizualizați fișierul 

@@ -365,7 +365,7 @@ export default {
 
               'min-width': 180
 
             },
 
             {
 
-              prop: 'classId',
 
+              prop: 'className',
 
               label: '分类',
 
               align: 'center',
 
               'min-width': 100

+ 0 - 0
pt/dist/web/css/chunk-8802a91a.14b5db3a.css → pt/dist/web/css/chunk-02addfa6.14b5db3a.css
Vizualizați fișierul


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
pt/dist/web/css/chunk-cf9a98d2.38477d04.css


+ 1 - 1
pt/dist/web/index.html
Vizualizați fișierul 

@@ -43,4 +43,4 @@
 
 			.once .sub-title {
 
 				color: #ababab;
 
 				font-size: 12px;
 
-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.747a879d.js" rel="preload" as="script"><link href="/js/chunk-libs.45fbbdb7.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="http://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.45fbbdb7.js"></script><script src="/js/app.747a879d.js"></script></body></html>
 
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.9bc7bd1a.js" rel="preload" as="script"><link href="/js/chunk-libs.45fbbdb7.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="http://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.45fbbdb7.js"></script><script src="/js/app.9bc7bd1a.js"></script></body></html>

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
pt/dist/web/js/app.747a879d.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
pt/dist/web/js/app.9bc7bd1a.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
pt/dist/web/js/chunk-0044508d.4f1a5c0e.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
pt/dist/web/js/chunk-0044508d.89d096a5.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
pt/dist/web/js/chunk-02addfa6.701729f3.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
pt/dist/web/js/chunk-04e2da8e.9d511230.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
pt/dist/web/js/chunk-22bc7a56.cb4a17c8.js


+ 0 - 1
pt/dist/web/js/chunk-2d0baa68.a26d0ee3.js
Vizualizați fișierul 

@@ -1 +0,0 @@
 
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0baa68"],{"37b0":function(e,t,n){"use strict";n.r(t),n.d(t,"MerchantService",(function(){return o}));var a=n("1222"),r=n("a3b6"),c=n("e752"),u=n("51e3"),i=n("c081"),o=function(e){Object(c["a"])(n,e);var t=Object(u["a"])(n);function n(){return Object(a["a"])(this,n),t.apply(this,arguments)}return Object(r["a"])(n,[{key:"getH5MallQrCode",value:function(e){return this.request({url:"/merchant/get-h5-mall-qr-code",params:e})}}]),n}(i["BaseService"]);t["default"]=new o}}]);

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
pt/dist/web/js/chunk-5c48017e.b694eb36.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
pt/dist/web/js/chunk-6fbc11da.d460e9d7.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
pt/dist/web/js/chunk-cf9a98d2.573eaa03.js


+ 2 - 9
pt/src/components/module/sj-list-layer.vue
Vizualizați fișierul 

@@ -91,12 +91,7 @@ export default {
 
     },
 
     onLoad ({ ctx, app }) {
 
       this.app = app;
 
-      let applyHost = () => {
 
-        return this.$service.saasShop.merchantList({ style: '3' });
 
-      };
 
-      ctx.service({
 
-        page: applyHost
 
-      })
 
+      ctx.service(this.$service.merchant)
 
         .set('table', {
 
           columns: [
 
             {
 
@@ -131,9 +126,6 @@ export default {
 
             placeholder: '商家名称'
 
           }
 
         })
 
-        .set('pagination', {
 
-          size: 6
 
-        })
 
         .set('layout', [
 
           ['slot-tabs'],
 
           ['search-key', 'flex1', 'refresh-btn'],
 
@@ -151,6 +143,7 @@ export default {
 
         })
 
         .done();
 
       app.refresh({ type: this.tabIndex });
 
+      app.refresh({ style: 3 });
 
     }
 
   }
 
 };

+ 3 - 1
pt/src/cool/request/index.js
Vizualizați fișierul 

@@ -31,6 +31,7 @@ import sj from '@/service/sj/index';
 
 import itemClass from '@/service/item-class/index';
 
 import item from '@/service/item/index';
 
 import unit from '@/service/unit/index';
 
+import merchant from '@/service/merchant/index';
 
 
 export function SET_SERVICE({ store }) {
 
 	// const files = require.context('@/service/', true, /\.js$/);
 
@@ -67,7 +68,8 @@ export function SET_SERVICE({ store }) {
 
 		sj,
 
 		itemClass,
 
 		item,
 
-		unit
 
+		unit,
 
+		merchant
 
 	};
 
 
 	Vue.prototype.$service = modules;

+ 12 - 8
pt/src/saas/shop/list.vue
Vizualizați fișierul 

@@ -300,13 +300,7 @@ export default {
 
     // crud
 
     onLoad ({ ctx, app }) {
 
       this.app = app;
 
-      let applyHost = () => {
 
-        return this.$service.saasShop.merchantList();
 
-      };
 
-
 
-      ctx.service({
 
-        page: applyHost
 
-      })
 
+      ctx.service(this.$service.merchant)
 
         .set('table', {
 
           columns: [
 
             {
 
@@ -356,8 +350,18 @@ export default {
 
             layout: ['slot-op-btn']
 
           }
 
         })
 
+		  .set('dict', {
 
+			  search: {
 
+				  keyWord: 'name'
 
+			  }
 
+		  })
 
+		  .set('search', {
 
+			  key: {
 
+				  placeholder: '商品名称'
 
+			  }
 
+		  })
 
         .set('layout', [
 
-          ['slot-activation', 'flex1', 'slot-add-ad-btn', 'refresh-btn'],
 
+          ['slot-activation',  'search-key', 'flex1', 'slot-add-ad-btn', 'refresh-btn'],
 
           ['data-table'],
 
           ['flex1', 'pagination']
 
         ])

+ 1 - 0
pt/src/service/merchant/index.js
Vizualizați fișierul 

@@ -1,4 +1,5 @@
 
 import { BaseService, Service } from '@/cool';
 
+@Service('merchant')
 
 export class MerchantService extends BaseService {
 
     getH5MallQrCode(data) {
 
         return this.request({

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff