jf 5 лет назад
Родитель
Сommit
be0595f100

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/build/mp-weixin/admin/staff/list.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/build/mp-weixin/admin/staff/list.wxml


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/build/mp-weixin/admin/staff/list.wxss


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/dist/build/mp-weixin/common/vendor.js


+ 2 - 2
hdApp/dist/build/mp-weixin/components/app-img.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/components/app-uploader.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 1 - 1
hdApp/dist/build/mp-weixin/components/kd_entrance.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/kd_entrance"],{3467:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={data:function(){return{constant:this.$constant}}};t.default=u},4578:function(n,t,e){"use strict";e.r(t);var u=e("d044a"),a=e("dbe2");for(var r in a)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(r);e("8858");var c,f=e("41a2"),o=Object(f["a"])(a["default"],u["b"],u["c"],!1,null,"939fcdd2",null,!1,u["a"],c);t["default"]=o.exports},8858:function(n,t,e){"use strict";var u=e("ef52"),a=e.n(u);a.a},d044a:function(n,t,e){"use strict";var u;e.d(t,"b",(function(){return a})),e.d(t,"c",(function(){return r})),e.d(t,"a",(function(){return u}));var a=function(){var n=this,t=n.$createElement;n._self._c},r=[]},dbe2:function(n,t,e){"use strict";e.r(t);var u=e("3467"),a=e.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(r);t["default"]=a.a},ef52:function(n,t,e){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/kd_entrance"],{"073a":function(n,t,e){},3467:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={data:function(){return{constant:this.$constant}}};t.default=u},4578:function(n,t,e){"use strict";e.r(t);var u=e("6419"),a=e("dbe2");for(var r in a)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(r);e("6698");var c,o=e("41a2"),f=Object(o["a"])(a["default"],u["b"],u["c"],!1,null,"147e481d",null,!1,u["a"],c);t["default"]=f.exports},6419:function(n,t,e){"use strict";var u;e.d(t,"b",(function(){return a})),e.d(t,"c",(function(){return r})),e.d(t,"a",(function(){return u}));var a=function(){var n=this,t=n.$createElement;n._self._c},r=[]},6698:function(n,t,e){"use strict";var u=e("073a"),a=e.n(u);a.a},dbe2:function(n,t,e){"use strict";e.r(t);var u=e("3467"),a=e.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(r);t["default"]=a.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/kd_entrance-create-component',
     'components/kd_entrance-create-component',
     {
     {

+ 1 - 1
hdApp/dist/build/mp-weixin/components/kd_entrance.wxml

@@ -1 +1 @@
-<image class="icon_kd data-v-939fcdd2" src="{{constant.imgUrl+'/ghs/home/icon_kd.png'}}" data-event-opts="{{[['tap',[['pageTo',[['o',['url','/admin/billing/index']]]]]]]}}" bindtap="__e"></image>
+<image class="icon_kd data-v-147e481d" src="{{constant.imgUrl+'/ghs/home/icon_kd.png'}}" data-event-opts="{{[['tap',[['pageTo',[['o',['url','/admin/billing/index']]]]]]]}}" bindtap="__e"></image>

+ 1 - 1
hdApp/dist/build/mp-weixin/components/kd_entrance.wxss

@@ -1 +1 @@
-.icon_kd.data-v-939fcdd2{position:fixed;z-index:9999;bottom:100rpx;right:50rpx;width:100rpx;height:100rpx;box-sizing:border-box;border-radius:50%;overflow:hidden}
+.icon_kd.data-v-147e481d{position:fixed;z-index:9999;bottom:106rpx;right:50rpx;width:100rpx;height:100rpx;box-sizing:border-box;border-radius:50%;overflow:hidden}

+ 2 - 2
hdApp/dist/build/mp-weixin/components/module/app-order-list.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/components/module/app-search.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/components/plugin/alert.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/components/plugin/badge.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/components/plugin/bottom-popup.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/components/plugin/rate.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/components/plugin/selectList.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/components/plugin/tabs.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/pagesInvite/inviteItem.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/pagesPurchase/components/gatheringList.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 1 - 1
hdApp/src/mixins/product.js

@@ -96,7 +96,7 @@ export default {
 					let commonChildList = [];
 					let commonChildList = [];
 					if (!this.$util.isEmpty(commonList.child)) {
 					if (!this.$util.isEmpty(commonList.child)) {
 						commonList.child.forEach(ele => {
 						commonList.child.forEach(ele => {
-							let hasName = ele.itemName && ele.itemName.indexOf(this.py) >= 0;
+							let hasName = ele.goodsName && ele.goodsName.indexOf(this.py) >= 0;
 							let elePy = (ele.py && ele.py.toLocaleUpperCase()) || "";
 							let elePy = (ele.py && ele.py.toLocaleUpperCase()) || "";
 							let hasPy = elePy.indexOf(this.py.toLocaleUpperCase()) >= 0;
 							let hasPy = elePy.indexOf(this.py.toLocaleUpperCase()) >= 0;
 							if (hasName || hasPy) {
 							if (hasName || hasPy) {

Некоторые файлы не были показаны из-за большого количества измененных файлов