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

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-coupon-sel.json

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

ghsApp/dist/build/mp-weixin/components/app-date-picker.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/app-date-picker"],{"2f8d":function(t,e,a){"use strict";a.r(e);var n=a("f4cd"),r=a("a382");for(var u in r)["default"].indexOf(u)<0&&function(t){a.d(e,t,(function(){return r[t]}))}(u);var c,i=a("0095"),d=Object(i["a"])(r["default"],n["b"],n["c"],!1,null,"33cedf5f",null,!1,n["a"],c);e["default"]=d.exports},9570:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n={name:"app-date-picker",props:{mode:{type:String,default:"date"},placeholder:{type:String,default:null},dateVal:{type:String,default:""},startDate:{type:String,default:""},endDate:{type:String,default:""}},data:function(){return{date:null}},watch:{dateVal:function(t){this.date=t}},computed:{startDate2:function(){return console.log(this.getDate("start")),this.getDate("start")},endDate2:function(){return this.getDate("end")}},methods:{bindDateChange:function(t){var e=t.target.value;this.date=e,console.log(e),this.$emit("update:dateVal",e),this.$emit("change",e)},getDate:function(t){var e=new Date,a=e.getFullYear(),n=e.getMonth()+1,r=e.getDate();return"start"===t?a=this.startDate:"end"===t&&(a=this.endDate),n=n>9?n:"0"+n,r=r>9?r:"0"+r,"".concat(a,"-").concat(n,"-").concat(r)}}};e.default=n},a382:function(t,e,a){"use strict";a.r(e);var n=a("9570"),r=a.n(n);for(var u in n)["default"].indexOf(u)<0&&function(t){a.d(e,t,(function(){return n[t]}))}(u);e["default"]=r.a},f4cd:function(t,e,a){"use strict";var n;a.d(e,"b",(function(){return r})),a.d(e,"c",(function(){return u})),a.d(e,"a",(function(){return n}));var r=function(){var t=this,e=t.$createElement;t._self._c},u=[]}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/app-date-picker"],{"2f8d":function(t,e,a){"use strict";a.r(e);var n=a("2fbe"),r=a("a382");for(var u in r)["default"].indexOf(u)<0&&function(t){a.d(e,t,(function(){return r[t]}))}(u);var i,c=a("0095"),d=Object(c["a"])(r["default"],n["b"],n["c"],!1,null,"4998f8d1",null,!1,n["a"],i);e["default"]=d.exports},"2fbe":function(t,e,a){"use strict";var n;a.d(e,"b",(function(){return r})),a.d(e,"c",(function(){return u})),a.d(e,"a",(function(){return n}));var r=function(){var t=this,e=t.$createElement;t._self._c},u=[]},9570:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n={name:"app-date-picker",props:{mode:{type:String,default:"date"},placeholder:{type:String,default:null},dateVal:{type:String,default:""},startDate:{type:String,default:""},endDate:{type:String,default:""}},data:function(){return{date:null}},watch:{dateVal:function(t){this.date=t}},computed:{startDate2:function(){return console.log(this.getDate("start")),this.getDate("start")},endDate2:function(){return this.getDate("end")}},methods:{bindDateChange:function(t){var e=t.target.value;this.date=e,console.log(e),this.$emit("update:dateVal",e),this.$emit("change",e)},getDate:function(t){var e=new Date,a=e.getFullYear(),n=e.getMonth()+1,r=e.getDate();return"start"===t?a=this.startDate:"end"===t&&(a=this.endDate),n=n>9?n:"0"+n,r=r>9?r:"0"+r,"".concat(a,"-").concat(n,"-").concat(r)}}};e.default=n},a382:function(t,e,a){"use strict";a.r(e);var n=a("9570"),r=a.n(n);for(var u in n)["default"].indexOf(u)<0&&function(t){a.d(e,t,(function(){return n[t]}))}(u);e["default"]=r.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/app-date-picker-create-component',
     {

ghsApp/dist/build/mp-weixin/components/app-date-picker.wxml

@@ -1 +1 @@
-<view class="data-v-33cedf5f"><picker mode="{{mode}}" value="{{date}}" start="{{startDate2}}" end="{{endDate2}}" data-event-opts="{{[['change',[['bindDateChange',['$event']]]]]}}" bindchange="__e" class="data-v-33cedf5f"><block wx:if="{{$slots.default}}"><slot></slot></block><block wx:else><view class="uni-input data-v-33cedf5f"><block wx:if="{{placeholder&&!date}}"><label class="_span data-v-33cedf5f">{{placeholder}}</label></block><block wx:else><label class="_span data-v-33cedf5f">{{date}}</label></block><label class="_span data-v-33cedf5f"></label></view></block></picker></view>
+<view class="data-v-4998f8d1"><picker mode="{{mode}}" value="{{date}}" start="{{startDate2}}" end="{{endDate2}}" data-event-opts="{{[['change',[['bindDateChange',['$event']]]]]}}" bindchange="__e" class="data-v-4998f8d1"><block wx:if="{{$slots.default}}"><slot></slot></block><block wx:else><view class="uni-input data-v-4998f8d1"><block wx:if="{{placeholder&&!date}}"><label style="color:#ccc;" class="_span data-v-4998f8d1">{{placeholder}}</label></block><block wx:else><label class="_span data-v-4998f8d1">{{date}}</label></block><label class="_span data-v-4998f8d1"></label></view></block></picker></view>

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-wrapper-empty.json

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

ghsApp/dist/build/mp-weixin/components/module/allMoreSelectInput.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 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

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

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

ghsApp/dist/build/mp-weixin/components/module/dorpdownSelect.wxss

@@ -1 +1 @@
-.select-bg_bx .select-title.data-v-4a385013{color:#666;font-size:26rpx}.select-bg_bx .select-title .iconsanjiao_xia.data-v-4a385013{margin-left:10rpx}.select-bg_bx .select-title.select_corlor.data-v-4a385013{color:#3385ff}.select-bg_bx .select-title.select_corlor .iconsanjiao_xia.data-v-4a385013{-webkit-transform:rotate(180deg);transform:rotate(180deg)}.select-bg_bx .select-mark-view.data-v-4a385013{height:100vh;height:100%;position:fixed;width:100%;background-color:rgba(0,0,0,.5);left:0;top:0rpx;z-index:900}.select-bg_bx .select-fixed_bx.data-v-4a385013{position:fixed;width:100%;background-color:#fff;left:0;z-index:999;padding:120rpx 30rpx 40rpx;border-radius:0rpx 0rpx 20rpx 20rpx;-webkit-transition:all .5s ease-in-out;transition:all .5s ease-in-out}.select-bg_bx .select-fixed_bx .select-item-box .title.data-v-4a385013{font-size:24rpx;color:#333;font-weight:600;text-align:left}.select-bg_bx .select-fixed_bx .select-item-box .item-child_box.data-v-4a385013{padding:20rpx 0 0;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.select-bg_bx .select-fixed_bx .select-item-box .item-child_box .admin-button-com.data-v-4a385013{margin-bottom:20rpx;padding:18rpx 50rpx;margin-right:20rpx}.select-bg_bx .select-fixed_bx .select-item-box .item-child_box .admin-button-com.custom.data-v-4a385013{width:100%}
+.select-bg_bx .select-title.data-v-376463ef{color:#666;font-size:26rpx}.select-bg_bx .select-title .iconsanjiao_xia.data-v-376463ef{margin-left:10rpx}.select-bg_bx .select-title.select_corlor.data-v-376463ef{color:#3385ff}.select-bg_bx .select-title.select_corlor .iconsanjiao_xia.data-v-376463ef{-webkit-transform:rotate(180deg);transform:rotate(180deg)}.select-bg_bx .select-mark-view.data-v-376463ef{height:100vh;height:100%;position:fixed;width:100%;background-color:rgba(0,0,0,.5);left:0;top:0rpx;z-index:900}.select-bg_bx .select-fixed_bx.data-v-376463ef{position:fixed;width:100%;background-color:#fff;left:0;z-index:999;padding:120rpx 30rpx 40rpx;border-radius:0rpx 0rpx 20rpx 20rpx;-webkit-transition:all .5s ease-in-out;transition:all .5s ease-in-out}.select-bg_bx .select-fixed_bx .select-item-box .title.data-v-376463ef{font-size:24rpx;color:#333;font-weight:600;text-align:left}.select-bg_bx .select-fixed_bx .select-item-box .item-child_box.data-v-376463ef{padding:20rpx 0 0;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.select-bg_bx .select-fixed_bx .select-item-box .item-child_box .admin-button-com.data-v-376463ef{margin-bottom:20rpx;padding:18rpx 50rpx;margin-right:20rpx}.select-bg_bx .select-fixed_bx .select-item-box .item-child_box .admin-button-com.custom.data-v-376463ef{width:100%}

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/bottom-popup.json

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

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/modal.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/plugin/simple-address.json

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

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

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

ghsApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json

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

ghsApp/src/pagesStatistics/business.vue

@@ -71,7 +71,7 @@
 						>
 						</image>
 						<text class="title">
-							今日销售 ¥ {{baseInfo.today}}
+							今日收入 ¥ {{baseInfo.today}}
 						</text>
 					</view>
 				</view>
@@ -79,14 +79,14 @@
 			<view class="space-view space-remark">
 				<view class="space-left">
 					<view class="show-item">
-						<view class="show-name">近7天销售</view>
+						<view class="show-name">近7天收入</view>
 						<view class="show-value"><text class="unit">￥</text>{{baseInfo.latestSeven}}</view>
 					</view>
 				</view>
 				<view class="space-right">
 					<view class="show-item">
 						<view class="show-name">
-							近30天销售
+							近30天收入
 						</view>
 						<view class="show-value red"><text class="unit">￥</text>{{baseInfo.latestThirty}}</view>
 					</view>
@@ -109,12 +109,9 @@
 						<template v-if="index == curTabIndex">
 							<view class="list-item" >
 								<view class="item-left">
+
 									<view class="content-row">
-										<text class="content-label"> 销售数量</text>
-										<text class="content-value"> <text class="unit"></text> {{item.saleNum}}</text>
-									</view>
-									<view class="content-row">
-										<text class="content-label"> 销售金额</text>
+										<text class="content-label"> 收入金额</text>
 										<text class="content-value"> <text class="unit">¥</text> {{item.saleAmount}}</text>
 									</view>
 								</view>

hdApp/dist/build/mp-weixin/admin/coupon/components/selectCouponItem.json

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

hdApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json

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

hdApp/dist/build/mp-weixin/components/app-coupon-sel.json

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

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

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

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

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

hdApp/dist/build/mp-weixin/components/module/allMoreSelectInput.json

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

hdApp/dist/build/mp-weixin/components/module/app-avatar.json

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

hdApp/dist/build/mp-weixin/components/module/app-goods-commodity-style.json

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

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

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

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

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

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

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

hdApp/dist/build/mp-weixin/components/plugin/dropdown-list.json

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

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

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

hdApp/dist/build/mp-weixin/components/plugin/modal.json

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

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

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

hdApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json

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

hdApp/dist/build/mp-weixin/pagesPurchase/orderItem.json

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

hdApp/src/admin/billing/affirmPxClass.vue

@@ -35,7 +35,7 @@
 						<input type="number" placeholder="请填写" v-model="phone" placeholder-class="tui-placeholder">
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
-						<view class="tui-title ">结算方式</view>
+						<view class="tui-title ">付款方式</view>
 						<button class="admin-button-com mini-btn" :class="payType==res.id?'blue':'default'" style="margin-right: 10rpx"
 														@tap="payType=res.id"  v-for="(res,i) in getDictionariesInfo.htPayWayOption">
 							{{ res.name }}

hdApp/src/pagesStatistics/business.vue

@@ -71,7 +71,7 @@
 						>
 						</image>
 						<text class="title">
-							今日销售 ¥ {{baseInfo.today}}
+							今日收入 ¥ {{baseInfo.today}}
 						</text>
 					</view>
 				</view>
@@ -79,14 +79,14 @@
 			<view class="space-view space-remark">
 				<view class="space-left">
 					<view class="show-item">
-						<view class="show-name">近7天销售</view>
+						<view class="show-name">近7天收入</view>
 						<view class="show-value"><text class="unit">￥</text>{{baseInfo.latestSeven}}</view>
 					</view>
 				</view>
 				<view class="space-right">
 					<view class="show-item">
 						<view class="show-name">
-							近30天销售
+							近30天收入
 						</view>
 						<view class="show-value red"><text class="unit">￥</text>{{baseInfo.latestThirty}}</view>
 					</view>
@@ -109,12 +109,9 @@
 						<template v-if="index == curTabIndex">
 							<view class="list-item" >
 								<view class="item-left">
+
 									<view class="content-row">
-										<text class="content-label"> 销售数量</text>
-										<text class="content-value"> <text class="unit"></text> {{item.saleNum}}</text>
-									</view>
-									<view class="content-row">
-										<text class="content-label"> 销售金额</text>
+										<text class="content-label"> 收入金额</text>
 										<text class="content-value"> <text class="unit">¥</text> {{item.saleAmount}}</text>
 									</view>
 								</view>

mallApp/src/pages/home/shop.vue

@@ -108,21 +108,11 @@ export default {
   methods: {
     init () {
       this._detail();
-
-      // #ifdef H5
-      // 微信二次分享
-      let href = window.location.href;
-      if (href.indexOf("from=singlemessage") > 0) {
-        location.href = `${this.$constant.formal
-          }/#/pages/home/shop${this.$util.parse(this.option)}`;
-        return false;
-      }
-      // #endif
       let account = uni.getStorageSync('account')
       getShopUser().then(res => {
         // 设置分享
         let shareParams = {
-          title: `${res.name}`, // 分享标题
+          title: `门店`, // 分享标题
           desc: "这家店不错推荐给你", // 分享内容
           imgUrl: "",
           // #ifndef H5