Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghsApp/dist/build/mp-weixin/admin/home/callback.wxml

@@ -1 +1 @@
-<app-result vue-id="3bfbabcf-1" title="充值成功" class="data-v-63712b30" bind:__l="__l" vue-slots="{{['default']}}"><view class="yourAccount data-v-63712b30">你的账号已延长至</view><view class="dateLengthen data-v-63712b30">{{userInfo.deadline}}</view><button data-event-opts="{{[['tap',[['back',['$event']]]]]}}" class="admin-button-com big data-v-63712b30" bindtap="__e">返回管理中心</button></app-result>
+<app-result vue-id="3bfbabcf-1" title="续期成功" class="data-v-02ea564d" bind:__l="__l" vue-slots="{{['default']}}"><view class="yourAccount data-v-02ea564d">你的账号已延长至</view><view class="dateLengthen data-v-02ea564d">{{userInfo.deadline}}</view><button data-event-opts="{{[['tap',[['back',['$event']]]]]}}" class="admin-button-com big data-v-02ea564d" bindtap="__e">返回管理中心</button></app-result>

ghsApp/dist/build/mp-weixin/admin/home/callback.wxss

@@ -1 +1 @@
-.admin-button-com.data-v-63712b30{margin-bottom:20rpx;width:100%}.yourAccount.data-v-63712b30{color:#666;font-size:28rpx}.dateLengthen.data-v-63712b30{color:#666;font-size:28rpx;margin:20rpx 0 50rpx}
+.admin-button-com.data-v-02ea564d{margin-bottom:20rpx;width:100%}.yourAccount.data-v-02ea564d{color:#666;font-size:28rpx}.dateLengthen.data-v-02ea564d{color:#666;font-size:28rpx;margin:20rpx 0 50rpx}

ghsApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json

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

ghsApp/dist/build/mp-weixin/admin/home/components/plugin/timeaxis-item.json

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

ghsApp/dist/build/mp-weixin/components/app-img.json

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

ghsApp/dist/build/mp-weixin/components/app-result.json

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

ghsApp/dist/build/mp-weixin/components/app-uploader.json

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

ghsApp/dist/build/mp-weixin/components/app-wrapper-empty.json

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

ghsApp/dist/build/mp-weixin/components/module/app-search.json

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

ghsApp/dist/build/mp-weixin/components/none-hd.json

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

ghsApp/dist/build/mp-weixin/components/plugin/alert.json

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

ghsApp/dist/build/mp-weixin/components/plugin/badge.json

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

ghsApp/dist/build/mp-weixin/components/plugin/fab.json

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

ghsApp/dist/build/mp-weixin/components/plugin/list-cell.json

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

ghsApp/dist/build/mp-weixin/components/plugin/selectList.json

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

ghsApp/dist/build/mp-weixin/components/w-picker/date-picker.json

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

ghsApp/dist/build/mp-weixin/components/w-picker/half-picker.json

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

ghsApp/dist/build/mp-weixin/components/w-picker/linkage-picker.json

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

ghsApp/dist/build/mp-weixin/components/w-picker/range-picker.json

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

ghsApp/dist/build/mp-weixin/components/w-picker/region-picker.json

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

ghsApp/dist/build/mp-weixin/components/w-picker/selector-picker.json

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

ghsApp/dist/build/mp-weixin/components/w-picker/shortterm-picker.json

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

ghsApp/dist/build/mp-weixin/components/w-picker/time-picker.json

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

ghsApp/dist/build/mp-weixin/pagesArrears/detailsItem.json

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

ghsApp/dist/build/mp-weixin/pagesClient/member/detail.wxss

@@ -1,9 +1,9 @@
-.module-com.data-v-19ac7028{margin:0 30rpx 20rpx;padding:20rpx;background-color:#fff;border-radius:10rpx;position:relative;z-index:10}.user-info.data-v-19ac7028{padding:60rpx 20rpx 60rpx;position:relative;top:51rpx}.user-info .user-info_top.data-v-19ac7028{position:relative;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;height:100rpx}.user-info .user-info_top .user-info_lf.data-v-19ac7028{position:relative;padding-left:10rpx;-webkit-box-flex:1;-webkit-flex:1;flex:1}.user-info .user-info_top .user-info_lf .avatar.data-v-19ac7028{position:absolute;left:10rpx;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.user-info .user-info_top .user-info_lf .dec-bx.data-v-19ac7028{padding-left:130rpx}.user-info .user-info_top .user-info_lf .dec-bx > view.data-v-19ac7028:nth-child(1){color:#333;font-size:36rpx;margin-bottom:3rpx}.user-info .user-info_top .user-info_lf .dec-bx > view.data-v-19ac7028:nth-child(2){color:#666;font-size:30rpx}.user-info .user-info_top .already-shop.data-v-19ac7028{color:#09bb07;font-size:30rpx;font-weight:400}.user-info .user-info_top .already-shop > .iconfont.data-v-19ac7028{padding-right:8rpx;font-size:32rpx}.invite-bt.data-v-19ac7028{color:#fff;font-size:26rpx;font-weight:400;width:140rpx;height:50rpx;line-height:50rpx;background-color:#3385ff;text-align:center;border-radius:25rpx;border:1rpx solid #ddd;padding:0;-webkit-user-select:none;user-select:none;outline:none}.invite-bt.white.data-v-19ac7028{background-color:#fff;color:#666}.total-wrap .total-tit.data-v-19ac7028,
-.order-wrap .total-tit.data-v-19ac7028{padding:18rpx 0 18rpx 20rpx;border-bottom:1rpx solid #eee;font-weight:600;font-size:24rpx;color:#333}.total-wrap .total-blo.data-v-19ac7028,
-.order-wrap .total-blo.data-v-19ac7028{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-flex-wrap:wrap;flex-wrap:wrap;padding:30rpx 0 0rpx}.total-wrap .total-blo .total-list.data-v-19ac7028,
-.order-wrap .total-blo .total-list.data-v-19ac7028{width:33%;text-align:center;margin:20rpx 0rpx;border-right:1rpx solid #eee}.total-wrap .total-blo .total-list .app-color-3.data-v-19ac7028,
-.order-wrap .total-blo .total-list .app-color-3.data-v-19ac7028{font-size:24rpx}.total-wrap .total-blo .total-list .list-num.data-v-19ac7028,
-.order-wrap .total-blo .total-list .list-num.data-v-19ac7028{margin-top:8rpx;margin-bottom:8rpx;font-size:36rpx;font-weight:700}.total-wrap .total-blo .total-list .list-num.color-blue.data-v-19ac7028,
-.order-wrap .total-blo .total-list .list-num.color-blue.data-v-19ac7028{color:#3385ff}.total-wrap .total-blo .total-list.data-v-19ac7028:nth-child(3n),
-.order-wrap .total-blo .total-list.data-v-19ac7028:nth-child(3n){border-right:none}.total-wrap .total-blo .total-list.data-v-19ac7028:nth-child(n + 4),
-.order-wrap .total-blo .total-list.data-v-19ac7028:nth-child(n + 4){padding-bottom:0}.user-address_bx.data-v-19ac7028{margin-top:70rpx;padding:20rpx 0}.user-address_bx .address-tit.data-v-19ac7028{color:#999;font-size:24rpx;font-weight:600;padding:10rpx 0 20rpx 20rpx;border-bottom:1rpx solid #eee}.user-address_bx .address-des_bx.data-v-19ac7028{display:-webkit-box;display:-webkit-flex;display:flex;padding:20rpx 10rpx 30rpx 20rpx}.user-address_bx .address-des_bx > view.data-v-19ac7028:nth-child(1){-webkit-box-flex:1;-webkit-flex:1;flex:1;margin-top:10rpx}.user-address_bx .address-des_bx > view:nth-child(1) > view.data-v-19ac7028:nth-child(1){color:#333;font-size:28rpx;font-weight:700;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.user-address_bx .address-des_bx > view:nth-child(1) > view:nth-child(1) .admin-button-com.data-v-19ac7028{margin-left:10rpx;border-radius:25rpx}.user-address_bx .address-des_bx > view:nth-child(1) > view.data-v-19ac7028:nth-child(2){color:#666;font-size:28rpx;font-weight:400;margin-top:20rpx}.user-address_bx .address-des_bx > view.data-v-19ac7028:nth-child(2){display:-webkit-box;display:-webkit-flex;display:flex}.user-address_bx .address-des_bx > view:nth-child(2) .icondianhua1.data-v-19ac7028{font-size:44rpx;color:#3385ff;margin-left:10rpx}.user-open_bx.data-v-19ac7028{margin-top:20rpx;padding:0}.user-open_bx .switch_bx.data-v-19ac7028{-webkit-box-flex:1;-webkit-flex:1;flex:1;text-align:right}.user-open_bx .switch_bx > text.data-v-19ac7028{color:#999;font-size:28rpx;display:inline-block;margin-right:22rpx}
+.module-com.data-v-202140b2{margin:0 30rpx 20rpx;padding:20rpx;background-color:#fff;border-radius:10rpx;position:relative;z-index:10}.user-info.data-v-202140b2{padding:60rpx 20rpx 60rpx;position:relative;top:51rpx}.user-info .user-info_top.data-v-202140b2{position:relative;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;height:100rpx}.user-info .user-info_top .user-info_lf.data-v-202140b2{position:relative;padding-left:10rpx;-webkit-box-flex:1;-webkit-flex:1;flex:1}.user-info .user-info_top .user-info_lf .avatar.data-v-202140b2{position:absolute;left:10rpx;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.user-info .user-info_top .user-info_lf .dec-bx.data-v-202140b2{padding-left:130rpx}.user-info .user-info_top .user-info_lf .dec-bx > view.data-v-202140b2:nth-child(1){color:#333;font-size:36rpx;margin-bottom:3rpx}.user-info .user-info_top .user-info_lf .dec-bx > view.data-v-202140b2:nth-child(2){color:#666;font-size:30rpx}.user-info .user-info_top .already-shop.data-v-202140b2{color:#09bb07;font-size:30rpx;font-weight:400}.user-info .user-info_top .already-shop > .iconfont.data-v-202140b2{padding-right:8rpx;font-size:32rpx}.invite-bt.data-v-202140b2{color:#fff;font-size:26rpx;font-weight:400;width:140rpx;height:50rpx;line-height:50rpx;background-color:#3385ff;text-align:center;border-radius:25rpx;border:1rpx solid #ddd;padding:0;-webkit-user-select:none;user-select:none;outline:none}.invite-bt.white.data-v-202140b2{background-color:#fff;color:#666}.total-wrap .total-tit.data-v-202140b2,
+.order-wrap .total-tit.data-v-202140b2{padding:18rpx 0 18rpx 20rpx;border-bottom:1rpx solid #eee;font-weight:600;font-size:24rpx;color:#333}.total-wrap .total-blo.data-v-202140b2,
+.order-wrap .total-blo.data-v-202140b2{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-flex-wrap:wrap;flex-wrap:wrap;padding:30rpx 0 0rpx}.total-wrap .total-blo .total-list.data-v-202140b2,
+.order-wrap .total-blo .total-list.data-v-202140b2{width:33%;text-align:center;margin:20rpx 0rpx;border-right:1rpx solid #eee}.total-wrap .total-blo .total-list .app-color-3.data-v-202140b2,
+.order-wrap .total-blo .total-list .app-color-3.data-v-202140b2{font-size:24rpx}.total-wrap .total-blo .total-list .list-num.data-v-202140b2,
+.order-wrap .total-blo .total-list .list-num.data-v-202140b2{margin-top:8rpx;margin-bottom:8rpx;font-size:36rpx;font-weight:700}.total-wrap .total-blo .total-list .list-num.color-blue.data-v-202140b2,
+.order-wrap .total-blo .total-list .list-num.color-blue.data-v-202140b2{color:#3385ff}.total-wrap .total-blo .total-list.data-v-202140b2:nth-child(3n),
+.order-wrap .total-blo .total-list.data-v-202140b2:nth-child(3n){border-right:none}.total-wrap .total-blo .total-list.data-v-202140b2:nth-child(n + 4),
+.order-wrap .total-blo .total-list.data-v-202140b2:nth-child(n + 4){padding-bottom:0}.user-address_bx.data-v-202140b2{margin-top:70rpx;padding:20rpx 0}.user-address_bx .address-tit.data-v-202140b2{color:#999;font-size:24rpx;font-weight:600;padding:10rpx 0 20rpx 20rpx;border-bottom:1rpx solid #eee}.user-address_bx .address-des_bx.data-v-202140b2{display:-webkit-box;display:-webkit-flex;display:flex;padding:20rpx 10rpx 30rpx 20rpx}.user-address_bx .address-des_bx > view.data-v-202140b2:nth-child(1){-webkit-box-flex:1;-webkit-flex:1;flex:1;margin-top:10rpx}.user-address_bx .address-des_bx > view:nth-child(1) > view.data-v-202140b2:nth-child(1){color:#333;font-size:28rpx;font-weight:700;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.user-address_bx .address-des_bx > view:nth-child(1) > view:nth-child(1) .admin-button-com.data-v-202140b2{margin-left:10rpx;border-radius:25rpx}.user-address_bx .address-des_bx > view:nth-child(1) > view.data-v-202140b2:nth-child(2){color:#666;font-size:28rpx;font-weight:400;margin-top:20rpx}.user-address_bx .address-des_bx > view.data-v-202140b2:nth-child(2){display:-webkit-box;display:-webkit-flex;display:flex}.user-address_bx .address-des_bx > view:nth-child(2) .icondianhua1.data-v-202140b2{font-size:44rpx;color:#3385ff;margin-left:10rpx}.user-open_bx.data-v-202140b2{margin-top:20rpx;padding:0}.user-open_bx .switch_bx.data-v-202140b2{-webkit-box-flex:1;-webkit-flex:1;flex:1;text-align:right}.user-open_bx .switch_bx > text.data-v-202140b2{color:#999;font-size:28rpx;display:inline-block;margin-right:22rpx}

ghsApp/dist/build/mp-weixin/pagesInvite/inviteItem.json

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

ghsApp/src/mixins/productContrapose.js

@@ -81,9 +81,10 @@ export default {
 		 * 搜索对应花材
 		 */
 		searchFnContrapose() {
-			let list = copyObject(this.filterProductInfoContrapose);
+			let list = copyObject(this.allFilterProductInfoContrapose);
 			if(!this.$util.isEmpty(this.py)){
 				let commonChildList = [];
+				console.log(this.py)
 				list.forEach(ele => {
 						let hasName = ele.itemName && ele.itemName.indexOf(this.py) >= 0;
 						let elePy = (ele.py && ele.py.toLocaleUpperCase()) || "";

ghsApp/src/pagesPurchase/add.vue

@@ -1,62 +1,30 @@
 <template>
 	<view class="billing_box_bg">
 		<view class="input-wrap">
-			<app-search-module
-				v-model="py"
-				placeholder="请输入关键词，支持拼音首字母搜索"
-				@search="searchFn"
-			/>
+			<app-search-module v-model="py" placeholder="请输入关键词，支持拼音首字母搜索" @input="searchFn"/>
 		</view>
 
 		<view class="scroll-middle_bx">
-			<scroll-view
-				scroll-y
-				scroll-with-animation
-				class="tab-view"
-				:scroll-top="scrollTop"
-			>
-				<div
-					v-for="(item, index) in filterProductInfo"
-					:key="index"
-					class="tab-bar-item"
-					:class="[classIndex == index ? 'active' : '']"
-					:data-current="index"
-					@tap.stop="swichClass"
-				>
+			<scroll-view scroll-y scroll-with-animation class="tab-view" :scroll-top="scrollTop">
+				<div v-for="(item, index) in filterProductInfo" :key="index" class="tab-bar-item" :class="[classIndex == index ? 'active' : '']" :data-current="index" @tap.stop="swichClass(index)">
 					<text>{{ item.className || "" }}</text>
-					<text
-						class="tag"
-						v-if="
-							getSelectClassById(item.classId).bigCount > 0 ||
-								getSelectClassById(item.classId).smallCount > 0
-						"
-					>
-						<text
-							v-if="
-								getSelectClassById(item.classId).bigCount > 0 ||
-									getSelectClassById(item.classId).smallCount > 0
-							"
-						>
+					<text class="tag" v-if="getSelectClassById(item.classId).bigCount > 0 || getSelectClassById(item.classId).smallCount > 0">
+						<text v-if="getSelectClassById(item.classId).bigCount > 0 || getSelectClassById(item.classId).smallCount > 0">
 							{{ `${getSelectClassById(item.classId).bigCount}` }}
 						</text>
-						<text v-if="getSelectClassById(item.classId).smallCount > 0">
-							/
-						</text>
-						<text v-if="getSelectClassById(item.classId).smallCount > 0">{{
-							getSelectClassById(item.classId).smallCount
-						}}</text>
+						<text v-if="getSelectClassById(item.classId).smallCount > 0">/</text>
+						<text v-if="getSelectClassById(item.classId).smallCount > 0">{{getSelectClassById(item.classId).smallCount}}</text>
 					</text>
 				</div>
 			</scroll-view>
-			<scroll-view scroll-y class="right-box" :scroll-into-view="scrollClassId">
+<!--			<scroll-view scroll-y class="right-box" :scroll-into-view="scrollClassId">-->
+			<scroll-view scroll-y class="right-box" :scroll-into-view="scroll_into_view" scroll-with-animation="true"
+																@scroll="scroll_detail"
+																lower-threshold="100"
+																@scrolltolower="scroll_bottom">
 				<!--内容部分 start -->
 				<block v-if="!$util.isEmpty(filterProductInfo)">
-					<view
-						class="item_list_bx"
-						v-for="(classItem, classIndex) in filterProductInfo"
-						:key="classIndex"
-						:id="`class_${classItem.classId}`"
-					>
+					<view class="item_list_bx selectAll" v-for="(classItem, classIndex) in filterProductInfo" :key="classIndex" :id="`class_${classIndex}`">
 						<view class="item_list_title">
 							{{ classItem.className }}
 						</view>
@@ -279,7 +247,6 @@ export default {
 			}
 		},
 
-		searchFn() {},
 		scrollTop() {}
 	}
 };

ghsApp/src/pagesStorehouse/stockWarn/detailed.vue

@@ -130,14 +130,14 @@ export default {
 					color: "info"
 				},
 				{
-					name: "变化",
+					name: "变动",
 					custom: "change",
 					color: "info",
 					width: 120,
 					align: "center"
 				},
 				{
-					name: "剩余库存",
+					name: "当前库存",
 					custom: "stock",
 					color: "info",
 					align: "center"

hdApp/src/pagesStorehouse/stockWarn/detailed.vue

@@ -130,14 +130,14 @@ export default {
 					color: "info"
 				},
 				{
-					name: "变化",
+					name: "变动",
 					custom: "change",
 					color: "info",
 					width: 120,
 					align: "center"
 				},
 				{
-					name: "剩余库存",
+					name: "当前库存",
 					custom: "stock",
 					color: "info",
 					align: "center"

mallApp/src/pages/pay/index.vue

@@ -126,12 +126,15 @@
 			...mapGetters({ shopUser: 'getShopUser' })
 		},
 		onLoad(option) {
-			this.specialInit()
+			// this.specialInit()
 		},
 		mounted() {},
 		methods: {
 			isWxMiniapp(){
         return isWxMiniapp()
+      },
+      init(){
+			  this.specialInit();
       },
 			specialInit() {
 				// #ifdef H5