Home Explore Help
Register Sign In
zhh
/
front-end
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

ghs app update

shish 5 years ago
parent
85bd96d69d
commit
2ce8060a5e
43 changed files with 62 additions and 66 deletions
Unified View Show Diff Stats
  1. 0 0
      ghs/dist/shop/css/chunk-485dc8a0.4dcce162.css
  2. 1 1
      ghs/dist/shop/index.html
  3. 0 0
      ghs/dist/shop/js/app.f2dd60f3.js
  4. 0 0
      ghs/dist/shop/js/chunk-485dc8a0.32a3370c.js
  5. 0 0
      ghs/dist/shop/js/chunk-d549990c.12ebd793.js
  6. 1 1
      ghs/src/views/order/components/sel-order.vue
  7. 0 0
      ghsApp/dist/build/mp-weixin/admin/billing/affirm.js
  8. 0 0
      ghsApp/dist/build/mp-weixin/admin/billing/affirm.wxml
  9. 0 0
      ghsApp/dist/build/mp-weixin/admin/billing/affirm.wxss
  10. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json
  11. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/plugin/timeaxis-item.json
  12. 2 2
      ghsApp/dist/build/mp-weixin/components/app-date-picker.json
  13. 0 0
      ghsApp/dist/build/mp-weixin/components/app-form-send1.js
  14. 2 2
      ghsApp/dist/build/mp-weixin/components/app-uploader.json
  15. 2 2
      ghsApp/dist/build/mp-weixin/components/kd_entrance.json
  16. 2 2
      ghsApp/dist/build/mp-weixin/components/module/allMoreSelectInput.json
  17. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-close.json
  18. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-search.json
  19. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-tag.json
  20. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-vip.json
  21. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/alert.json
  22. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json
  23. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/fab.json
  24. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/modal.json
  25. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/simple-address.json
  26. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-table.json
  27. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/date-picker.json
  28. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/half-picker.json
  29. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/linkage-picker.json
  30. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/range-picker.json
  31. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/region-picker.json
  32. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/selector-picker.json
  33. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/shortterm-picker.json
  34. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/time-picker.json
  35. 2 2
      ghsApp/dist/build/mp-weixin/pagesArrears/detailsItem.json
  36. 2 2
      ghsApp/dist/build/mp-weixin/pagesInvite/inviteItem.json
  37. 2 2
      ghsApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json
  38. 0 0
      ghsApp/dist/build/mp-weixin/pagesOrder/shipInfo.js
  39. 1 1
      ghsApp/dist/build/mp-weixin/pagesOrder/shipInfo.wxml
  40. 0 0
      ghsApp/dist/build/mp-weixin/pagesOrder/shipInfo.wxss
  41. 2 2
      ghsApp/dist/build/mp-weixin/pagesPurchase/orderItem.json
  42. 1 4
      ghsApp/src/components/app-form-send1.vue
  43. 2 3
      ghsApp/src/pagesOrder/shipInfo.vue

File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/css/chunk-485dc8a0.4dcce162.css


+ 1 - 1
ghs/dist/shop/index.html
View File 

@@ -43,4 +43,4 @@
 
 			.once .sub-title {
 
 			.once .sub-title {
 
 				color: #ababab;
 
 				color: #ababab;
 
 				font-size: 12px;
 
 				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.a719ac03.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.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.1c1e0cb4.js"></script><script src="/js/app.a719ac03.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.f2dd60f3.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.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.1c1e0cb4.js"></script><script src="/js/app.f2dd60f3.js"></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/app.f2dd60f3.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-485dc8a0.32a3370c.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-d549990c.12ebd793.js


+ 1 - 1
ghs/src/views/order/components/sel-order.vue
View File 

@@ -193,7 +193,7 @@
 
 								<el-input v-model="orderForm.receiveFloor" placeholder="楼号门牌号（选填）" size="mini"></el-input>
 
 								<el-input v-model="orderForm.receiveFloor" placeholder="楼号门牌号（选填）" size="mini"></el-input>
 
 							</el-form-item>
 
 							</el-form-item>
 
 							<el-form-item label="配送时间" prop="reachTime" style="margin-bottom: 8px;">
 
 							<el-form-item label="配送时间" prop="reachTime" style="margin-bottom: 8px;">
 
-							<el-time-picker format='HH:mm' value-format="HH:mm" v-model="orderForm.reachTime" @change="freight" placeholder="任意时间点" style="width: 100%" size="mini">
 
+							<el-time-picker format='HH:mm' value-format="HH:mm" v-model="orderForm.reachTime" @change="freight" placeholder="请选择时间" style="width: 100%" size="mini">
 
 							</el-time-picker>
 
 							</el-time-picker>
 
 							</el-form-item>
 
 							</el-form-item>
 
 							<el-form-item label="运费" prop="remark" style="margin-bottom: 8px;">
 
 							<el-form-item label="运费" prop="remark" style="margin-bottom: 8px;">

File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/billing/affirm.js


File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/billing/affirm.wxml


File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/billing/affirm.wxss


+ 2 - 2
ghsApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json
View File 

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/admin/home/components/plugin/timeaxis-item.json
View File 

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/app-date-picker.json
View File 

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

File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/mp-weixin/components/app-form-send1.js


+ 2 - 2
ghsApp/dist/build/mp-weixin/components/app-uploader.json
View File 

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/kd_entrance.json
View File 

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/allMoreSelectInput.json
View File 

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/app-close.json
View File 

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/app-search.json
View File 

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/app-tag.json
View File 

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/app-vip.json
View File 

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/alert.json
View File 

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json
View File 

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/fab.json
View File 

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/modal.json
View File 

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/simple-address.json
View File 

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-table.json
View File 

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/date-picker.json
View File 

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/half-picker.json
View File 

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/linkage-picker.json
View File 

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/range-picker.json
View File 

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/region-picker.json
View File 

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/selector-picker.json
View File 

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/shortterm-picker.json
View File 

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/time-picker.json
View File 

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/pagesArrears/detailsItem.json
View File 

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/pagesInvite/inviteItem.json
View File 

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

+ 2 - 2
ghsApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json
View File 

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

File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesOrder/shipInfo.js


+ 1 - 1
ghsApp/dist/build/mp-weixin/pagesOrder/shipInfo.wxml
View File 

@@ -1 +1 @@
 
-<view class="affirm-page data-v-0e612c8a"><view class="affirm-view overscroll data-v-0e612c8a"><form class="data-v-0e612c8a"><view class="module-com input-line-wrap data-v-0e612c8a"><app-form-send vue-id="5f335135-1" form="{{form}}" customId="{{customId}}" orderid="{{orderId}}" data-event-opts="{{[['^updateForm',[['__set_sync',['$0','form','$event'],['']]]]]}}" bind:updateForm="__e" class="data-v-0e612c8a" bind:__l="__l"></app-form-send></view></form><view class="admin-button-com-box data-v-0e612c8a"><navigator class="admin-button-com blue middle active data-v-0e612c8a" open-type="navigateBack" delta="1">取消</navigator><button data-event-opts="{{[['tap',[['formSubmit',['$event']]]]]}}" class="admin-button-com blue middle data-v-0e612c8a" bindtap="__e">确定</button></view></view><kd-entrance vue-id="5f335135-2" class="data-v-0e612c8a" bind:__l="__l"></kd-entrance></view>
 
+<view class="affirm-page data-v-1f62971a"><view class="affirm-view overscroll data-v-1f62971a"><form class="data-v-1f62971a"><view class="module-com input-line-wrap data-v-1f62971a"><app-form-send vue-id="5f335135-1" form="{{form}}" customId="{{customId}}" orderid="{{orderId}}" data-event-opts="{{[['^updateForm',[['__set_sync',['$0','form','$event'],['']]]]]}}" bind:updateForm="__e" class="data-v-1f62971a" bind:__l="__l"></app-form-send></view></form><view class="admin-button-com-box data-v-1f62971a"><button data-event-opts="{{[['tap',[['formSubmit',['$event']]]]]}}" class="admin-button-com blue big data-v-1f62971a" bindtap="__e">确定</button></view></view><kd-entrance vue-id="5f335135-2" class="data-v-1f62971a" bind:__l="__l"></kd-entrance></view>

File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesOrder/shipInfo.wxss


+ 2 - 2
ghsApp/dist/build/mp-weixin/pagesPurchase/orderItem.json
View File 

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

+ 1 - 4
ghsApp/src/components/app-form-send1.vue
View File 

@@ -13,10 +13,7 @@
 
 		<!-- 门店送或快递送需要设置地址 -->
 
 		<!-- 门店送或快递送需要设置地址 -->
 
 		<appAddressGroup :customId="customId" cityTitle="配送城市" @selectAdress="selectAdress" ></appAddressGroup>
 
 		<appAddressGroup :customId="customId" cityTitle="配送城市" @selectAdress="selectAdress" ></appAddressGroup>
 
 		<!-- <appSendTime @alterTime="selectAdress('')" :sendDate.sync="formData.sendDate" :sendTime.sync="formData.sendTime"></appSendTime> -->  
 		<!-- <appSendTime @alterTime="selectAdress('')" :sendDate.sync="formData.sendDate" :sendTime.sync="formData.sendTime"></appSendTime> -->  
-    <appTimer :sendTime="formData.sendTime" @confirm="onConfirm"></appTimer>
 
-
 
-
 
-
 
+    	<appTimer :sendTime="formData.sendTime" @confirm="onConfirm"></appTimer>
 
 		<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 
 		<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 
 			<view class="tui-title">运费</view>
 
 			<view class="tui-title">运费</view>
 
 			<view v-if="formData.sendCost" class="tui-input">
 
 			<view v-if="formData.sendCost" class="tui-input">

+ 2 - 3
ghsApp/src/pagesOrder/shipInfo.vue
View File 

@@ -9,8 +9,7 @@
 
 				</view>
 
 				</view>
 
 			</form>
 
 			</form>
 
 			<view class="admin-button-com-box">
 
 			<view class="admin-button-com-box">
 
-				<navigator open-type="navigateBack" delta="1" class="admin-button-com blue middle active" >取消</navigator>
 
-				<button class="admin-button-com blue middle" @tap="formSubmit">确定</button>
 
+				<button class="admin-button-com blue big" @tap="formSubmit">确定</button>
 
 			</view>
 
 			</view>
 
 
 
 		</view>
 
 		</view>
 
@@ -312,7 +311,7 @@ export default {
 
 			display: flex;
 
 			display: flex;
 
 			justify-content: space-between;
 
 			justify-content: space-between;
 
 			.admin-button-com{
 
 			.admin-button-com{
 
-				width: 30%;
 
+				width: 100%;
 
 				display: block;
 
 				display: block;
 
 				margin: 0 auto;
 
 				margin: 0 auto;
 
 				&.active{
 
 				&.active{

Some files were not shown because too many files changed in this diff