shish 5 jaren geleden
bovenliggende
commit
80d68c4523
51 gewijzigde bestanden met toevoegingen van 86 en 119 verwijderingen
  1. 0 0
      ghsApp/dist/build/mp-weixin/admin/ad/list.js
  2. 0 0
      ghsApp/dist/build/mp-weixin/admin/ad/list.wxml
  3. 1 1
      ghsApp/dist/build/mp-weixin/admin/ad/list.wxss
  4. 0 0
      ghsApp/dist/build/mp-weixin/admin/billing/affirm.js
  5. 0 0
      ghsApp/dist/build/mp-weixin/admin/billing/affirm.wxml
  6. 0 0
      ghsApp/dist/build/mp-weixin/admin/billing/affirm.wxss
  7. 0 0
      ghsApp/dist/build/mp-weixin/admin/billing/index.js
  8. 0 0
      ghsApp/dist/build/mp-weixin/admin/billing/index.wxml
  9. 0 0
      ghsApp/dist/build/mp-weixin/admin/billing/index.wxss
  10. 0 0
      ghsApp/dist/build/mp-weixin/admin/billing/result.js
  11. 1 1
      ghsApp/dist/build/mp-weixin/admin/billing/result.wxml
  12. 1 1
      ghsApp/dist/build/mp-weixin/admin/billing/result.wxss
  13. 0 0
      ghsApp/dist/build/mp-weixin/admin/custom/selectCustom.js
  14. 1 1
      ghsApp/dist/build/mp-weixin/admin/custom/selectCustom.wxml
  15. 0 0
      ghsApp/dist/build/mp-weixin/admin/custom/selectCustom.wxss
  16. 0 0
      ghsApp/dist/build/mp-weixin/admin/home/member.js
  17. 0 0
      ghsApp/dist/build/mp-weixin/admin/home/member.wxml
  18. 0 0
      ghsApp/dist/build/mp-weixin/admin/home/member.wxss
  19. 1 2
      ghsApp/dist/build/mp-weixin/app.json
  20. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-avatar.json
  21. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/fab.json
  22. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/simple-address.json
  23. 0 0
      ghsApp/dist/build/mp-weixin/pagesOrder/detail.js
  24. 0 0
      ghsApp/dist/build/mp-weixin/pagesOrder/detail.wxml
  25. 0 0
      ghsApp/dist/build/mp-weixin/pagesOrder/detail.wxss
  26. 6 33
      ghsApp/dist/build/mp-weixin/project.config.json
  27. 0 7
      ghsApp/dist/build/mp-weixin/sitemap.json
  28. 1 1
      ghsApp/src/admin/custom/selectCustom.vue
  29. 1 1
      ghsApp/src/admin/home/member.vue
  30. 17 17
      ghsApp/src/pagesOrder/detail.vue
  31. 2 2
      hdApp/dist/build/mp-weixin/admin/home/components/plugin/timeaxis-item.json
  32. 2 2
      hdApp/dist/build/mp-weixin/admin/order/components/card-name.json
  33. 2 2
      hdApp/dist/build/mp-weixin/components/app-coupon-sel.json
  34. 2 2
      hdApp/dist/build/mp-weixin/components/module/allSelectInput.json
  35. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-close.json
  36. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-goods-commodity-style.json
  37. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-order-list.json
  38. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-vip.json
  39. 2 2
      hdApp/dist/build/mp-weixin/components/none-hd.json
  40. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/dropdown-list.json
  41. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/modal.json
  42. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/rate.json
  43. 2 2
      hdApp/dist/build/mp-weixin/pagesArrears/detailsItem.json
  44. 1 1
      hdApp/dist/build/mp-weixin/pagesPurchase/particulars.js
  45. 1 1
      hdApp/dist/build/mp-weixin/pagesPurchase/particulars.wxml
  46. 1 1
      hdApp/dist/build/mp-weixin/pagesPurchase/particulars.wxss
  47. 0 0
      hdApp/dist/build/mp-weixin/pagesPurchase/purDetails.js
  48. 0 0
      hdApp/dist/build/mp-weixin/pagesPurchase/purDetails.wxml
  49. 0 0
      hdApp/dist/build/mp-weixin/pagesPurchase/purDetails.wxss
  50. 1 0
      hdApp/dist/build/mp-weixin/project.config.json
  51. 20 19
      hdApp/src/pagesPurchase/purDetails.vue

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


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


+ 1 - 1
ghsApp/dist/build/mp-weixin/admin/ad/list.wxss

@@ -1 +1 @@
-.app-content.data-v-347cf6ea{min-height:calc(100vh - 200rpx);padding-top:100rpx;padding-bottom:100rpx}.list-wrap.data-v-347cf6ea{width:100%;position:relative;background-color:#fff}.list-wrap .list.data-v-347cf6ea{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;padding:20rpx 30rpx}.list-wrap .list .list-img.data-v-347cf6ea{width:300rpx;height:168rpx}.list-wrap .list .list-img ._img.data-v-347cf6ea{height:100%!important}.list-wrap .list .list-right.data-v-347cf6ea{width:calc(100% - 320rpx);color:#999;margin-left:20rpx}.list-wrap .list .list-right > ._div.data-v-347cf6ea{margin-top:20rpx}.list-wrap .list .list-right > ._div.data-v-347cf6ea:first-child{margin-top:0}.list-wrap .list .list-right .list-option.data-v-347cf6ea{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:end;-webkit-align-items:flex-end;align-items:flex-end;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between}.app-footer.data-v-347cf6ea{-webkit-box-pack:end;-webkit-justify-content:flex-end;justify-content:flex-end}.app-footer .admin-button-com.data-v-347cf6ea{width:160rpx;margin-right:30rpx}
+.app-content.data-v-7517901c{min-height:calc(100vh - 200rpx);padding-top:100rpx;padding-bottom:100rpx}.list-wrap.data-v-7517901c{width:100%;position:relative;background-color:#fff}.list-wrap .list.data-v-7517901c{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;padding:20rpx 30rpx}.list-wrap .list .list-img.data-v-7517901c{width:300rpx;height:168rpx}.list-wrap .list .list-img ._img.data-v-7517901c{height:100%!important}.list-wrap .list .list-right.data-v-7517901c{width:calc(100% - 320rpx);color:#999;margin-left:20rpx}.list-wrap .list .list-right > ._div.data-v-7517901c{margin-top:20rpx}.list-wrap .list .list-right > ._div.data-v-7517901c:first-child{margin-top:0}.list-wrap .list .list-right .list-option.data-v-7517901c{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:end;-webkit-align-items:flex-end;align-items:flex-end;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between}.app-footer.data-v-7517901c{-webkit-box-pack:end;-webkit-justify-content:flex-end;justify-content:flex-end}.app-footer .admin-button-com.data-v-7517901c{width:160rpx;margin-right:30rpx}

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


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


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


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


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


+ 1 - 1
ghsApp/dist/build/mp-weixin/admin/billing/result.wxml

@@ -1 +1 @@
-<app-result vue-id="3f90d7e7-1" title="{{option.title}}" class="data-v-071af50f" bind:__l="__l" vue-slots="{{['default']}}"><block wx:if="{{option.title!='报损成功'}}"><button data-event-opts="{{[['tap',[['gotoOrderDetail',['$event']]]]]}}" class="admin-button-com big data-v-071af50f" bindtap="__e">订单详情</button></block><button data-event-opts="{{[['tap',[['goBackHome',['$event']]]]]}}" class="admin-button-com big data-v-071af50f" bindtap="__e">返回</button></app-result>
+<app-result vue-id="3f90d7e7-1" title="{{option.title}}" class="data-v-2b5ff49e" bind:__l="__l" vue-slots="{{['default']}}"><block wx:if="{{option.title!='报损成功'}}"><button data-event-opts="{{[['tap',[['gotoOrderDetail',['$event']]]]]}}" class="admin-button-com big data-v-2b5ff49e" bindtap="__e">订单详情</button></block><button data-event-opts="{{[['tap',[['goBackHome',['$event']]]]]}}" class="admin-button-com big data-v-2b5ff49e" bindtap="__e">返回首页</button></app-result>

+ 1 - 1
ghsApp/dist/build/mp-weixin/admin/billing/result.wxss

@@ -1 +1 @@
-.admin-button-com.data-v-071af50f{margin-bottom:20rpx;width:100%}
+.admin-button-com.data-v-2b5ff49e{margin-bottom:20rpx;width:100%}

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


+ 1 - 1
ghsApp/dist/build/mp-weixin/admin/custom/selectCustom.wxml

@@ -1 +1 @@
-<view class="app-main app-content _div data-v-df3ba880"><view class="input-wrap_box data-v-df3ba880"><view class="data-v-df3ba880"><app-search-module vue-id="4c8fb1ce-1" placeholder="请输入客户名称,支持拼音首字母" data-event-opts="{{[['^input',[['searchFn']]]]}}" bind:input="__e" class="data-v-df3ba880" bind:__l="__l"></app-search-module></view></view><block wx:if="{{!$root.g0}}"><block class="data-v-df3ba880"><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><block class="data-v-df3ba880"><tui-list-cell vue-id="{{'4c8fb1ce-2-'+index}}" arrow="{{true}}" data-event-opts="{{[['^click',[['selectCurrent',['$0'],[[['list.data','',index]]]]]]]}}" bind:click="__e" class="data-v-df3ba880" bind:__l="__l" vue-slots="{{['default']}}"><view class="tui-msg-box _div data-v-df3ba880"><image class="tui-msg-pic _img data-v-df3ba880" src="{{item.avatar}}" mode="widthFix"></image><view class="tui-msg-item _div data-v-df3ba880"><view class="tui-msg-name _div data-v-df3ba880"><view class="tui-user-name _div data-v-df3ba880">{{item.name}}</view></view><view class="tui-msg-content _div data-v-df3ba880"><label class="_span data-v-df3ba880">{{item.visitTime}}</label><block wx:if="{{item.debtAmount>0}}"><label class="debt-amount _span data-v-df3ba880">欠款:<label class="amount_num _span data-v-df3ba880">{{item.debtAmount}}</label></label></block></view></view></view><view class="tui-msg-right _div data-v-df3ba880"><block wx:if="{{item.messageNum>0}}"><badge-module vue-id="{{('4c8fb1ce-3-'+index)+','+('4c8fb1ce-2-'+index)}}" type="danger" dot="{{item.level==3?true:false}}" class="data-v-df3ba880" bind:__l="__l" vue-slots="{{['default']}}">{{item.messageNum}}</badge-module></block></view></tui-list-cell></block></block></block></block><block wx:else><block class="data-v-df3ba880"><app-wrapper-empty vue-id="4c8fb1ce-4" is-empty="{{$root.g1}}" class="data-v-df3ba880" bind:__l="__l"></app-wrapper-empty></block></block></view>
+<view class="app-main app-content _div data-v-8097696e"><view class="input-wrap_box data-v-8097696e"><view class="data-v-8097696e"><app-search-module vue-id="4c8fb1ce-1" placeholder="请输入客户名称,支持拼音首字母" data-event-opts="{{[['^input',[['searchFn']]]]}}" bind:input="__e" class="data-v-8097696e" bind:__l="__l"></app-search-module></view></view><block wx:if="{{!$root.g0}}"><block class="data-v-8097696e"><block wx:for="{{list.data}}" wx:for-item="item" wx:for-index="index" wx:key="index"><block class="data-v-8097696e"><tui-list-cell vue-id="{{'4c8fb1ce-2-'+index}}" arrow="{{true}}" data-event-opts="{{[['^click',[['selectCurrent',['$0'],[[['list.data','',index]]]]]]]}}" bind:click="__e" class="data-v-8097696e" bind:__l="__l" vue-slots="{{['default']}}"><view class="tui-msg-box _div data-v-8097696e"><image class="tui-msg-pic _img data-v-8097696e" src="{{item.avatar}}" mode="widthFix"></image><view class="tui-msg-item _div data-v-8097696e"><view class="tui-msg-name _div data-v-8097696e"><view class="tui-user-name _div data-v-8097696e">{{item.name}}</view></view><view class="tui-msg-content _div data-v-8097696e"><label class="_span data-v-8097696e">{{item.visitTime}}</label><block wx:if="{{item.debtAmount>0}}"><label class="debt-amount _span data-v-8097696e">欠款:<label class="amount_num _span data-v-8097696e">{{item.debtAmount}}</label></label></block></view></view></view><view class="tui-msg-right _div data-v-8097696e"><block wx:if="{{item.messageNum>0}}"><badge-module vue-id="{{('4c8fb1ce-3-'+index)+','+('4c8fb1ce-2-'+index)}}" type="danger" dot="{{item.level==3?true:false}}" class="data-v-8097696e" bind:__l="__l" vue-slots="{{['default']}}">{{item.messageNum}}</badge-module></block></view></tui-list-cell></block></block></block></block><block wx:else><block class="data-v-8097696e"><app-wrapper-empty vue-id="4c8fb1ce-4" is-empty="{{$root.g1}}" class="data-v-8097696e" bind:__l="__l"></app-wrapper-empty></block></block></view>

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


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


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


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


+ 1 - 2
ghsApp/dist/build/mp-weixin/app.json

@@ -354,6 +354,5 @@
     "t-tr": "/components/plugin/t-table/t-tr",
     "t-th": "/components/plugin/t-table/t-th",
     "t-td": "/components/plugin/t-table/t-td"
-  },
-  "sitemapLocation": "sitemap.json"
+  }
 }

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

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

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

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

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

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

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


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


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


+ 6 - 33
ghsApp/dist/build/mp-weixin/project.config.json

@@ -5,54 +5,27 @@
   },
   "setting": {
     "urlCheck": false,
-    "es6": true,
-    "enhance": true,
-    "postcss": true,
-    "preloadBackgroundData": false,
-    "minified": true,
-    "newFeature": false,
-    "coverView": true,
-    "nodeModules": false,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "enableEngineNative": false,
-    "useIsolateContext": true,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "showES6CompileOption": false
+    "es6": true
   },
   "compileType": "miniprogram",
   "libVersion": "",
   "appid": "wxcf32b3f0684c2433",
-  "projectname": "%E4%BE%9B%E5%BA%94%E5%95%86",
+  "projectname": "供应商",
   "condition": {
     "search": {
+      "current": -1,
       "list": []
     },
     "conversation": {
+      "current": -1,
       "list": []
     },
     "game": {
+      "current": -1,
       "list": []
     },
     "miniprogram": {
+      "current": -1,
       "list": []
     }
   }

+ 0 - 7
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": "*"
-  }]
-}

+ 1 - 1
ghsApp/src/admin/custom/selectCustom.vue

@@ -236,7 +236,7 @@ export default {
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
-      width: 180rpx;
+      width: 290rpx;
     }
   }
 

+ 1 - 1
ghsApp/src/admin/home/member.vue

@@ -247,7 +247,7 @@ export default {
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
-      width: 180rpx;
+      width: 260rpx;
     }
   }
 

+ 17 - 17
ghsApp/src/pagesOrder/detail.vue

@@ -48,7 +48,7 @@
 					<view>{{ detailInfo.shopAdminName }}</view>
 				</view>
 				<view class="order-info_box">
-					<view>出货日期:</view>
+					<view>出货时间:</view>
 					<view v-if="detailInfo.outTime == '0000-00-00 00:00:00'">-</view>
 					<view v-else>{{ detailInfo.outTime }}</view>
 				</view>
@@ -136,6 +136,22 @@
 					</view>
 				</view>
 			</view>
+			<view v-if="detailInfo.remark!=''" class="content-box price-detail">
+				<div class="module-com input-line-wrap">
+					<tui-list-cell class="line-cell" :hover="false">
+						<div class="tui-title">备注</div>
+						<input
+							:disabled="true"
+							v-model="detailInfo.remark"
+							placeholder-class="phcolor"
+							class="tui-input"
+							name="name"
+							maxlength="50"
+							type="text"
+						/>
+					</tui-list-cell>
+				</div>
+			</view>
 			<view class="content-box price-detail">
 				<div class="module-com input-line-wrap">
 					<tui-list-cell class="line-cell" :hover="false">
@@ -160,22 +176,6 @@
 					</tui-list-cell>
 				</div>
 			</view>
-			<view class="content-box price-detail">
-				<div class="module-com input-line-wrap">
-					<tui-list-cell class="line-cell" :hover="false">
-						<div class="tui-title">备注</div>
-						<input
-							:disabled="true"
-							v-model="detailInfo.remark"
-							placeholder-class="phcolor"
-							class="tui-input"
-							name="name"
-							maxlength="50"
-							type="text"
-						/>
-					</tui-list-cell>
-				</div>
-			</view>
 		</view>
 		<div class="app-footer">
 			<template v-for="s in detailInfo.buttonList">

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

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

+ 2 - 2
hdApp/dist/build/mp-weixin/admin/order/components/card-name.json

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

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

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

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

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

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

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

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

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

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

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

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

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

+ 2 - 2
hdApp/dist/build/mp-weixin/components/none-hd.json

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

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

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

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

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

+ 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/pagesArrears/detailsItem.json

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

+ 1 - 1
hdApp/dist/build/mp-weixin/pagesPurchase/particulars.js

@@ -1 +1 @@
-require('common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesPurchase/particulars"],{"231b":function(t,n,e){"use strict";e.r(n);var i=e("2927"),a=e("d5f6");for(var u in a)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(u);e("80c7");var o,c=e("0095"),r=Object(c["a"])(a["default"],i["b"],i["c"],!1,null,"728fcfa4",null,!1,i["a"],o);n["default"]=r.exports},2927:function(t,n,e){"use strict";var i;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){return i}));var a=function(){var t=this,n=t.$createElement;t._self._c},u=[]},6045:function(t,n,e){"use strict";(function(t){e("6cdc");i(e("4a15"));var n=i(e("231b"));function i(t){return t&&t.__esModule?t:{default:t}}t(n.default)}).call(this,e("f3be")["createPage"])},"80c7":function(t,n,e){"use strict";var i=e("ac7b"),a=e.n(i);a.a},"8d32":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i={name:"AppResult",data:function(){return{hasInit:!1}},onLoad:function(){this.hasInit=!0},onShow:function(){0==this.hasInit&&this.$store.commit("setLoginInfo",{})},methods:{openMind:function(){this.hasInit=!1,this.pageTo({url:"/pagesClient/official/warn"})},goClose:function(){this.pageTo({url:"/admin/home/workbench",type:3})},goDetail:function(){this.pageTo({url:"/pagesPurchase/purDetails?status=2&id="+this.option.id,type:2})}}};n.default=i},ac7b:function(t,n,e){},d5f6:function(t,n,e){"use strict";e.r(n);var i=e("8d32"),a=e.n(i);for(var u in i)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(u);n["default"]=a.a}},[["6045","common/runtime","common/vendor"]]]);
+require('common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pagesPurchase/particulars"],{"231b":function(t,n,e){"use strict";e.r(n);var a=e("75b7"),i=e("d5f6");for(var u in i)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(u);e("ea1a");var o,r=e("0095"),c=Object(r["a"])(i["default"],a["b"],a["c"],!1,null,"10ef607a",null,!1,a["a"],o);n["default"]=c.exports},"4f65":function(t,n,e){},6045:function(t,n,e){"use strict";(function(t){e("6cdc");a(e("4a15"));var n=a(e("231b"));function a(t){return t&&t.__esModule?t:{default:t}}t(n.default)}).call(this,e("f3be")["createPage"])},"75b7":function(t,n,e){"use strict";var a;e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){return a}));var i=function(){var t=this,n=t.$createElement;t._self._c},u=[]},"8d32":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var a={name:"AppResult",data:function(){return{hasInit:!1}},onLoad:function(){this.hasInit=!0},onShow:function(){0==this.hasInit&&this.$store.commit("setLoginInfo",{})},methods:{openMind:function(){this.hasInit=!1,this.pageTo({url:"/pagesClient/official/warn"})},goClose:function(){this.pageTo({url:"/admin/home/workbench",type:3})},goDetail:function(){this.pageTo({url:"/pagesPurchase/purDetails?status=2&id="+this.option.id,type:3})}}};n.default=a},d5f6:function(t,n,e){"use strict";e.r(n);var a=e("8d32"),i=e.n(a);for(var u in a)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(u);n["default"]=i.a},ea1a:function(t,n,e){"use strict";var a=e("4f65"),i=e.n(a);i.a}},[["6045","common/runtime","common/vendor"]]]);

+ 1 - 1
hdApp/dist/build/mp-weixin/pagesPurchase/particulars.wxml

@@ -1 +1 @@
-<view class="app-content data-v-728fcfa4"><view class="billing_box_bg data-v-728fcfa4"><view class="top-view data-v-728fcfa4"></view><view class="result-view data-v-728fcfa4"><view class="{{['data-v-728fcfa4','iconfont','iconchenggong']}}"></view><view class="result-title data-v-728fcfa4">支付成功</view><block wx:if="{{loginInfo.admin.subscribe==0}}"><button data-event-opts="{{[['tap',[['openMind',['$event']]]]]}}" class="admin-button-com blue big data-v-728fcfa4" bindtap="__e">开启动态提醒</button></block><block wx:if="{{loginInfo.admin.subscribe==0}}"><button data-event-opts="{{[['tap',[['goDetail',['$event']]]]]}}" class="admin-button-com big data-v-728fcfa4" bindtap="__e">订单详情</button></block><block wx:if="{{loginInfo.admin.subscribe==1}}"><button data-event-opts="{{[['tap',[['goDetail',['$event']]]]]}}" class="admin-button-com blue big data-v-728fcfa4" bindtap="__e">订单详情</button></block><button data-event-opts="{{[['tap',[['goClose',['$event']]]]]}}" class="admin-button-com big data-v-728fcfa4" bindtap="__e">返回首页</button></view></view></view>
+<view class="app-content data-v-10ef607a"><view class="billing_box_bg data-v-10ef607a"><view class="top-view data-v-10ef607a"></view><view class="result-view data-v-10ef607a"><view class="{{['data-v-10ef607a','iconfont','iconchenggong']}}"></view><view class="result-title data-v-10ef607a">支付成功</view><block wx:if="{{loginInfo.admin.subscribe==0}}"><button data-event-opts="{{[['tap',[['openMind',['$event']]]]]}}" class="admin-button-com blue big data-v-10ef607a" bindtap="__e">开启动态提醒</button></block><block wx:if="{{loginInfo.admin.subscribe==0}}"><button data-event-opts="{{[['tap',[['goDetail',['$event']]]]]}}" class="admin-button-com big data-v-10ef607a" bindtap="__e">订单详情</button></block><block wx:if="{{loginInfo.admin.subscribe==1}}"><button data-event-opts="{{[['tap',[['goDetail',['$event']]]]]}}" class="admin-button-com blue big data-v-10ef607a" bindtap="__e">订单详情</button></block><button data-event-opts="{{[['tap',[['goClose',['$event']]]]]}}" class="admin-button-com big data-v-10ef607a" bindtap="__e">返回首页</button></view></view></view>

+ 1 - 1
hdApp/dist/build/mp-weixin/pagesPurchase/particulars.wxss

@@ -1 +1 @@
-.billing_box_bg.data-v-728fcfa4{position:relative;padding:60rpx 30rpx;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;background-color:#f5f5f5}.billing_box_bg .top-view.data-v-728fcfa4{position:absolute;top:0;left:0;width:100%;height:299rpx;background:#3385ff;border-radius:0rpx 0rpx 83rpx 83rpx}.billing_box_bg .result-view.data-v-728fcfa4{position:relative;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;-webkit-box-align:center;-webkit-align-items:center;align-items:center;padding:70rpx;width:100%;background:#fff;border-radius:20rpx;z-index:1}.billing_box_bg .result-view .iconchenggong.data-v-728fcfa4{font-size:170rpx;color:#049e2c}.billing_box_bg .result-view .result-title.data-v-728fcfa4{margin:50rpx 0 70rpx;font-size:32rpx}.billing_box_bg .result-view .close_btn.data-v-728fcfa4{line-height:88rpx;text-align:center;width:550rpx;height:88rpx;border:1rpx solid #ddd;border-radius:8rpx;font-size:32rpx;color:#666}.billing_box_bg .admin-button-com.data-v-728fcfa4{margin-bottom:20rpx;width:100%}
+.billing_box_bg.data-v-10ef607a{position:relative;padding:60rpx 30rpx;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;background-color:#f5f5f5}.billing_box_bg .top-view.data-v-10ef607a{position:absolute;top:0;left:0;width:100%;height:299rpx;background:#3385ff;border-radius:0rpx 0rpx 83rpx 83rpx}.billing_box_bg .result-view.data-v-10ef607a{position:relative;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;-webkit-box-align:center;-webkit-align-items:center;align-items:center;padding:70rpx;width:100%;background:#fff;border-radius:20rpx;z-index:1}.billing_box_bg .result-view .iconchenggong.data-v-10ef607a{font-size:170rpx;color:#049e2c}.billing_box_bg .result-view .result-title.data-v-10ef607a{margin:50rpx 0 70rpx;font-size:32rpx}.billing_box_bg .result-view .close_btn.data-v-10ef607a{line-height:88rpx;text-align:center;width:550rpx;height:88rpx;border:1rpx solid #ddd;border-radius:8rpx;font-size:32rpx;color:#666}.billing_box_bg .admin-button-com.data-v-10ef607a{margin-bottom:20rpx;width:100%}

File diff suppressed because it is too large
+ 0 - 0
hdApp/dist/build/mp-weixin/pagesPurchase/purDetails.js


File diff suppressed because it is too large
+ 0 - 0
hdApp/dist/build/mp-weixin/pagesPurchase/purDetails.wxml


File diff suppressed because it is too large
+ 0 - 0
hdApp/dist/build/mp-weixin/pagesPurchase/purDetails.wxss


+ 1 - 0
hdApp/dist/build/mp-weixin/project.config.json

@@ -40,6 +40,7 @@
   },
   "compileType": "miniprogram",
   "libVersion": "",
+  "appid": "wx0d42f5f1dcb3a370",
   "projectname": "%E9%9B%B6%E5%94%AE",
   "condition": {
     "search": {

+ 20 - 19
hdApp/src/pagesPurchase/purDetails.vue

@@ -137,6 +137,25 @@
           </view>
         </view>
       </view>
+      <view v-if="detailInfo.remark !=''" class="content-box price-detail">
+        <div class="module-com input-line-wrap">
+          <tui-list-cell
+            class="line-cell"
+            :hover="false"
+          >
+            <div class="tui-title">备注</div>
+            <input
+              :disabled="true"
+              v-model="detailInfo.remark"
+              placeholder-class="phcolor"
+              class="tui-input"
+              name="name"
+              maxlength="50"
+              type="text"
+            />
+          </tui-list-cell>
+        </div>
+      </view>
       <view class="content-box price-detail">
         <div class="module-com input-line-wrap">
           <tui-list-cell class="line-cell" :hover="false">
@@ -161,25 +180,7 @@
           </tui-list-cell>
         </div>
       </view>
-      <view class="content-box price-detail">
-        <div class="module-com input-line-wrap">
-          <tui-list-cell
-            class="line-cell"
-            :hover="false"
-          >
-            <div class="tui-title">备注</div>
-            <input
-              :disabled="true"
-              v-model="detailInfo.remark"
-              placeholder-class="phcolor"
-              class="tui-input"
-              name="name"
-              maxlength="50"
-              type="text"
-            />
-          </tui-list-cell>
-        </div>
-      </view>
+
     </view>
     <view class="footer_bar" v-if="detailInfo.status == 1"><view @click="toPay">付款</view></view>
   </view>

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