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

ghs/src/views/order/list.vue

@@ -251,7 +251,7 @@ export default {
 							width: '150'
 						},
 						{
-							prop: 'sendType',
+							prop: 'sendTypeName',
 							label: '配送方式',
 							align: 'center',
 							width: '150'

ghsApp/dist/build/mp-weixin/admin/billing/priceChange.wxml

@@ -1 +1 @@
-<view class="billing_box_bg data-v-518a6adc"><view class="input-wrap data-v-518a6adc"><app-search-module vue-id="2b6abfff-1" placeholder="请输入关键词，支持拼音首字母搜索" value="{{py}}" data-event-opts="{{[['^search',[['searchFn']]],['^input',[['__set_model',['','py','$event',[]]]]]]}}" bind:search="__e" bind:input="__e" class="data-v-518a6adc" bind:__l="__l"></app-search-module></view><view class="scroll-middle_bx data-v-518a6adc"><block wx:if="{{!$root.g0}}"><block class="data-v-518a6adc"><view style="width:100%;padding:30rpx;" class="data-v-518a6adc"><block wx:for="{{filterProductInfoContrapose}}" wx:for-item="productItem" wx:for-index="productIndex" wx:key="productIndex"><commondity vue-id="{{'2b6abfff-2-'+productIndex}}" type="{{COMMODITY_TYPE.CHANGE}}" info="{{productItem}}" autoPrice="{{productItem.priceLabel=='2'?productItem.price:null}}" class="data-v-518a6adc" bind:__l="__l"></commondity></block></view></block></block><block wx:else><block class="data-v-518a6adc"><view style="width:100%;" class="data-v-518a6adc"><app-wrapper-empty vue-id="2b6abfff-3" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-518a6adc" bind:__l="__l"></app-wrapper-empty></view></block></block></view><kd-entrance vue-id="2b6abfff-4" class="data-v-518a6adc" bind:__l="__l"></kd-entrance></view>
+<view class="billing_box_bg data-v-5885abb2"><view class="input-wrap data-v-5885abb2"><app-search-module vue-id="2b6abfff-1" placeholder="请输入关键词，支持拼音首字母搜索" value="{{py}}" data-event-opts="{{[['^search',[['searchFn']]],['^input',[['__set_model',['','py','$event',[]]]]]]}}" bind:search="__e" bind:input="__e" class="data-v-5885abb2" bind:__l="__l"></app-search-module></view><view class="scroll-middle_bx data-v-5885abb2"><block wx:if="{{!$root.g0}}"><block class="data-v-5885abb2"><view style="width:100%;padding:30rpx;" class="data-v-5885abb2"><block wx:for="{{filterProductInfoContrapose}}" wx:for-item="productItem" wx:for-index="productIndex" wx:key="productIndex"><commondity vue-id="{{'2b6abfff-2-'+productIndex}}" type="{{COMMODITY_TYPE.CHANGE}}" info="{{productItem}}" autoPrice="{{productItem.priceLabel=='2'?productItem.price:null}}" class="data-v-5885abb2" bind:__l="__l"></commondity></block></view></block></block><block wx:else><block class="data-v-5885abb2"><view style="width:100%;" class="data-v-5885abb2"><app-wrapper-empty vue-id="2b6abfff-3" title="暂无数据" is-empty="{{$root.g1}}" class="data-v-5885abb2" bind:__l="__l"></app-wrapper-empty></view></block></block></view><kd-entrance vue-id="2b6abfff-4" class="data-v-5885abb2" bind:__l="__l"></kd-entrance></view>

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

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

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

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

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

@@ -1 +0,0 @@
-/* admin/home/console.wxss */

ghsApp/dist/build/mp-weixin/admin/shopAdmin/bind.wxss

@@ -1 +0,0 @@
-/* admin/shopAdmin/bind.wxss */

ghsApp/dist/build/mp-weixin/admin/staff/sel-member.wxss

@@ -1 +0,0 @@
-/* admin/staff/sel-member.wxss */

ghsApp/dist/build/mp-weixin/admin/statistics/demo.wxss

@@ -1 +0,0 @@
-/* admin/statistics/demo.wxss */

ghsApp/dist/build/mp-weixin/common/webview.wxss

@@ -1 +0,0 @@
-/* common/webview.wxss */

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

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

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-uploader.json

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

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/kd_entrance.json

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

ghsApp/dist/build/mp-weixin/components/module/allSelectInput.json

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

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

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

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

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

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

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

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

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

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

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

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

ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-table.json

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

ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-td.json

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

ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-th.json

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

ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-tr.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/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/pagesInvite/inviteItem.json

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

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

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

ghsApp/dist/build/mp-weixin/pagesOrder/print.wxss

@@ -1 +0,0 @@
-/* pagesOrder/print.wxss */

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

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

ghsApp/dist/build/mp-weixin/pagesStore/me/rechargeList.wxss

@@ -1 +0,0 @@
-/* pagesStore/me/rechargeList.wxss */

ghsApp/dist/build/mp-weixin/pagesStore/me/withdraw.wxss

@@ -1 +0,0 @@
-/* pagesStore/me/withdraw.wxss */

ghsApp/dist/build/mp-weixin/sitemap.json

@@ -1,7 +0,0 @@
-{
-  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
-  "rules": [{
-  "action": "allow",
-  "page": "*"
-  }]
-}

ghsApp/src/admin/home/me.vue

@@ -36,7 +36,7 @@
               </view>
             </view>
             <button
-              v-if="loginInfo.super"
+              v-if="loginInfo.switchShop"
               @click="shopShow"
               class="admin-button-com default chang-shop_btn"
             >

ghsApp/src/admin/staff/list.vue

@@ -29,10 +29,11 @@
 								</div>
 							</div>
 							<div class="list-det-right">
-								<div @click="pageTo({url: '/admin/staff/add',query: {id: item.id}})"><i class="iconfont iconbianji"></i></div>
-								<!-- <div @click="modifyModalFn(item)"><i class="iconfont iconbianji"></i></div> -->
+								<div v-if="item.super != 1" @click="pageTo({url: '/admin/staff/add',query: {id: item.id}})">
+								<i class="iconfont iconbianji"></i>
+								</div>
 								<!-- 删除 -->
-								<div @click="delModalFn(item)">
+								<div v-if="item.super != 1" @click="delModalFn(item)">
 									<i class="iconfont iconshanchu1"></i>
 								</div>
 							</div>

ghsApp/src/pagesStatistics/business.vue

@@ -5,7 +5,7 @@
 				<view class="amount-view">
 					<text class="amount-label">账户余额</text>
 					<view
-						v-if="loginInfo.super"
+						v-if="loginInfo.switchShop"
 						class="amount-btn">
 						<DorpdownSelect
 							:menuObj.sync="menuObj"