Compare commits

...

7 Commits

Author SHA1 Message Date
f4089c927f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	components/title-block/title-block.vue
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/components/title-block/title-block.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/components/uiq-tabbar/uiq-tabbar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/cameraContext/cameraContext.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/contract/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/set-up.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/order-goods/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/order-goods/order-details.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/paySuccess/paySuccess.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/realName/realName.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/register/register.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-button/u-button.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-count-down/u-count-down.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-divider/u-divider.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-image/u-image.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-input/u-input.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-line/u-line.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-transition/u-transition.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-upload/u-upload.js.map
#	unpackage/dist/dev/mp-weixin/common/vendor.js
#	unpackage/dist/dev/mp-weixin/components/title-block/title-block.js
#	unpackage/dist/dev/mp-weixin/components/uiq-tabbar/uiq-tabbar.js
#	unpackage/dist/dev/mp-weixin/pages/cameraContext/cameraContext.js
#	unpackage/dist/dev/mp-weixin/pages/contract/index.js
#	unpackage/dist/dev/mp-weixin/pages/login/login.js
#	unpackage/dist/dev/mp-weixin/pages/order-goods/index.js
#	unpackage/dist/dev/mp-weixin/pages/order-goods/order-details.js
#	unpackage/dist/dev/mp-weixin/pages/realName/realName.js
#	unpackage/dist/dev/mp-weixin/pages/register/register.js
#	unpackage/dist/dev/mp-weixin/tm-vuetify/components/tm-poup/tm-poup.js
#	unpackage/dist/dev/mp-weixin/uview-ui/components/u--image/u--image.js
#	unpackage/dist/dev/mp-weixin/uview-ui/components/u--input/u--input.js
#	unpackage/dist/dev/mp-weixin/uview-ui/components/u-badge/u-badge.js
#	unpackage/dist/dev/mp-weixin/uview-ui/components/u-button/u-button.js
#	unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js
#	unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js
#	unpackage/dist/dev/mp-weixin/uview-ui/components/u-count-down/u-count-down.js
#	unpackage/dist/dev/mp-weixin/uview-ui/components/u-divider/u-divider.js
#	unpackage/dist/dev/mp-weixin/uview-ui/components/u-icon/u-icon.js
#	unpackage/dist/dev/mp-weixin/uview-ui/components/u-image/u-image.js
#	unpackage/dist/dev/mp-weixin/uview-ui/components/u-input/u-input.js
#	unpackage/dist/dev/mp-weixin/uview-ui/components/u-line/u-line.js
#	unpackage/dist/dev/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js
#	unpackage/dist/dev/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js
#	unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js
#	unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js
#	unpackage/dist/dev/mp-weixin/uview-ui/components/u-transition/u-transition.js
#	unpackage/dist/dev/mp-weixin/uview-ui/components/u-upload/u-upload.js
2023-09-22 15:07:06 +08:00
b13aa9a66c submit 2023-09-22 15:06:42 +08:00
63854ca9a2 Merge branch 'xingyy'
# Conflicts:
#	components/title-block/title-block.vue
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/components/uiq-tabbar/uiq-tabbar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/cameraContext/cameraContext.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/contract/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/set-up.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/order-goods/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/order-goods/order-details.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/paySuccess/paySuccess.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/realName/realName.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/register/register.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-button/u-button.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-count-down/u-count-down.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-divider/u-divider.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-image/u-image.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-input/u-input.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-line/u-line.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-transition/u-transition.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-upload/u-upload.js.map
#	unpackage/dist/dev/mp-weixin/common/vendor.js
#	unpackage/dist/dev/mp-weixin/pages/contract/index.js
#	unpackage/dist/dev/mp-weixin/pages/order-goods/order-details.js
2023-09-22 15:04:46 +08:00
14820459e0 submit 2023-09-22 15:04:15 +08:00
f2f22b4ce5 submit 2023-09-22 15:03:45 +08:00
024a67a8ae submit 2023-09-22 15:03:02 +08:00
865a180629 submit 2023-09-22 14:31:17 +08:00
3 changed files with 6 additions and 5 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/unpackage/

View File

@ -46,10 +46,10 @@
<image src="../../static/jx632@3x.png"></image>
</div>
<div class="wrap1_2">
<div class="wrap1_2_1">画作的名称</div>
<div class="wrap1_2_2">订单号:0129181232101</div>
<div class="wrap1_2_3">16平尺</div>
<div class="wrap1_2_4">2023.09.01-2023.09.18</div>
<div class="wrap1_2_1">{{item.artworkName}}</div>
<div class="wrap1_2_2">订单号:{{item.artworkName}}</div>
<div class="wrap1_2_3">{{item.artworkSquareSize}}平尺</div>
<div class="wrap1_2_4">{{item.startAt.replaceAll('-','.')}}-{{item.endAt.replaceAll('-','.')}}</div>
</div>
<div class="wrap1_3" :class="[`status${item.status}`]">
<div class="wrap1_3_1" v-if="item.status===4">

View File

@ -1 +1 @@
<view class="order-goods _div data-v-c0c42e9e"><title-block vue-id="541fae75-1" title="订单库" class="data-v-c0c42e9e" bind:__l="__l" vue-slots="{{['left']}}"><view slot="left"><u-action-sheet vue-id="{{('541fae75-2')+','+('541fae75-1')}}" show="{{show}}" actions="{{$root.g0}}" title="请选择状态" data-event-opts="{{[['^close',[['e0']]],['^select',[['statusSelect']]]]}}" bind:close="__e" bind:select="__e" class="data-v-c0c42e9e" bind:__l="__l"></u-action-sheet><view data-event-opts="{{[['tap',[['openStatus',['$event']]]]]}}" class="wrap1 _div data-v-c0c42e9e" bindtap="__e"><view class="wrap1_1 _div data-v-c0c42e9e"><view class="wrap1_1_1 _div data-v-c0c42e9e">{{$root.g1.label}}</view><image style="width:12rpx;height:8rpx;" src="../../static/dbx2@3x.png" class="data-v-c0c42e9e"></image></view></view></view></title-block><view class="content2 _div data-v-c0c42e9e"><view class="wrap1 _div data-v-c0c42e9e"><view class="wrap1_1 _div data-v-c0c42e9e"><image src="../../static/zu1@3x.png" class="data-v-c0c42e9e"></image></view><view class="wrap1_2 _div data-v-c0c42e9e"></view><input placeholder-style="color: #C7C7C7;font-size: 20rpx;" placeholder="在此处搜索您的订单" data-event-opts="{{[['input',[['__set_model',['','mobileKey','$event',[]]]]]]}}" value="{{mobileKey}}" bindinput="__e" class="data-v-c0c42e9e"/></view><view data-event-opts="{{[['tap',[['search',['$event']]]]]}}" class="wrap2 _div data-v-c0c42e9e" bindtap="__e">搜索</view></view><scroll-view class="scrollbox data-v-c0c42e9e" style="margin-top:28rpx;" scroll-y="{{true}}" data-event-opts="{{[['scrolltolower',[['loadMore',['$event']]]]]}}" bindscrolltolower="__e"><view class="content3 _div data-v-c0c42e9e"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['touchstart',[['touchStart',['$event',index]]]],['touchmove',[['touchMove',['$event',index]]]],['touchend',[['e1',['$event']]]],['tap',[['goRouter',['$0'],[[['mainList','',index]]]]]]]}}" data-event-params="{{({index})}}" class="wrap1 _div data-v-c0c42e9e" style="{{'transform:'+('translateX('+item.$orig.distanceX+'px)')+';'}}" bindtouchstart="__e" bindtouchmove="__e" bindtouchend="__e" bindtap="__e"><view class="wrap1_1 _div data-v-c0c42e9e"><image src="../../static/jx632@3x.png" class="data-v-c0c42e9e"></image></view><view class="wrap1_2 _div data-v-c0c42e9e"><view class="wrap1_2_1 _div data-v-c0c42e9e">画作的名称</view><view class="wrap1_2_2 _div data-v-c0c42e9e">订单号:0129181232101</view><view class="wrap1_2_3 _div data-v-c0c42e9e">16平尺</view><view class="wrap1_2_4 _div data-v-c0c42e9e">2023.09.01-2023.09.18</view></view><view class="{{['wrap1_3','_div','data-v-c0c42e9e','status'+item.$orig.status]}}"><block wx:if="{{item.$orig.status===4}}"><view class="wrap1_3_1 _div data-v-c0c42e9e"><view class="wrap1_3_1_1 _div data-v-c0c42e9e">2023.09.28</view><view class="wrap1_3_1_2 _div data-v-c0c42e9e">已超时</view><view class="wrap1_3_1_3 _div data-v-c0c42e9e">点击补款</view></view></block><block wx:if="{{item.$orig.status!==4}}"><view class="wrap1_3_3 _div data-v-c0c42e9e"><view class="wrap1_3_3_1 _div data-v-c0c42e9e">{{item.g2.label}}</view></view></block><view class="wrap1_3_2 _div data-v-c0c42e9e"><view class="wrap1_3_2_1 _div data-v-c0c42e9e">货架号:</view><view class="wrap1_3_2_2 _div data-v-c0c42e9e">12-02-13</view></view></view><block wx:if="{{item.$orig.isRight&&item.$orig.status===5}}"><view class="wrap1_4 _div data-v-c0c42e9e"><image style="width:80rpx;height:80rpx;" src="../../static/zu154@3x.png" class="data-v-c0c42e9e"></image></view></block></view></block></view></scroll-view><tabbar vue-id="541fae75-3" current="{{1}}" class="data-v-c0c42e9e" bind:__l="__l"></tabbar></view>
<view class="order-goods _div data-v-c0c42e9e"><title-block vue-id="541fae75-1" title="订单库" class="data-v-c0c42e9e" bind:__l="__l" vue-slots="{{['left']}}"><view slot="left"><u-action-sheet vue-id="{{('541fae75-2')+','+('541fae75-1')}}" show="{{show}}" actions="{{$root.g0}}" title="请选择状态" data-event-opts="{{[['^close',[['e0']]],['^select',[['statusSelect']]]]}}" bind:close="__e" bind:select="__e" class="data-v-c0c42e9e" bind:__l="__l"></u-action-sheet><view data-event-opts="{{[['tap',[['openStatus',['$event']]]]]}}" class="wrap1 _div data-v-c0c42e9e" bindtap="__e"><view class="wrap1_1 _div data-v-c0c42e9e"><view class="wrap1_1_1 _div data-v-c0c42e9e">{{$root.g1.label}}</view><image style="width:12rpx;height:8rpx;" src="../../static/dbx2@3x.png" class="data-v-c0c42e9e"></image></view></view></view></title-block><view class="content2 _div data-v-c0c42e9e"><view class="wrap1 _div data-v-c0c42e9e"><view class="wrap1_1 _div data-v-c0c42e9e"><image src="../../static/zu1@3x.png" class="data-v-c0c42e9e"></image></view><view class="wrap1_2 _div data-v-c0c42e9e"></view><input placeholder-style="color: #C7C7C7;font-size: 20rpx;" placeholder="在此处搜索您的订单" data-event-opts="{{[['input',[['__set_model',['','mobileKey','$event',[]]]]]]}}" value="{{mobileKey}}" bindinput="__e" class="data-v-c0c42e9e"/></view><view data-event-opts="{{[['tap',[['search',['$event']]]]]}}" class="wrap2 _div data-v-c0c42e9e" bindtap="__e">搜索</view></view><scroll-view class="scrollbox data-v-c0c42e9e" style="margin-top:28rpx;" scroll-y="{{true}}" data-event-opts="{{[['scrolltolower',[['loadMore',['$event']]]]]}}" bindscrolltolower="__e"><view class="content3 _div data-v-c0c42e9e"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['touchstart',[['touchStart',['$event',index]]]],['touchmove',[['touchMove',['$event',index]]]],['touchend',[['e1',['$event']]]],['tap',[['goRouter',['$0'],[[['mainList','',index]]]]]]]}}" data-event-params="{{({index})}}" class="wrap1 _div data-v-c0c42e9e" style="{{'transform:'+('translateX('+item.$orig.distanceX+'px)')+';'}}" bindtouchstart="__e" bindtouchmove="__e" bindtouchend="__e" bindtap="__e"><view class="wrap1_1 _div data-v-c0c42e9e"><image src="../../static/jx632@3x.png" class="data-v-c0c42e9e"></image></view><view class="wrap1_2 _div data-v-c0c42e9e"><view class="wrap1_2_1 _div data-v-c0c42e9e">{{item.$orig.artworkName}}</view><view class="wrap1_2_2 _div data-v-c0c42e9e">{{"订单号:"+item.$orig.artworkName}}</view><view class="wrap1_2_3 _div data-v-c0c42e9e">{{item.$orig.artworkSquareSize+"平尺"}}</view><view class="wrap1_2_4 _div data-v-c0c42e9e">{{item.g2+"-"+item.g3}}</view></view><view class="{{['wrap1_3','_div','data-v-c0c42e9e','status'+item.$orig.status]}}"><block wx:if="{{item.$orig.status===4}}"><view class="wrap1_3_1 _div data-v-c0c42e9e"><view class="wrap1_3_1_1 _div data-v-c0c42e9e">2023.09.28</view><view class="wrap1_3_1_2 _div data-v-c0c42e9e">已超时</view><view class="wrap1_3_1_3 _div data-v-c0c42e9e">点击补款</view></view></block><block wx:if="{{item.$orig.status!==4}}"><view class="wrap1_3_3 _div data-v-c0c42e9e"><view class="wrap1_3_3_1 _div data-v-c0c42e9e">{{item.g4.label}}</view></view></block><view class="wrap1_3_2 _div data-v-c0c42e9e"><view class="wrap1_3_2_1 _div data-v-c0c42e9e">货架号:</view><view class="wrap1_3_2_2 _div data-v-c0c42e9e">12-02-13</view></view></view><block wx:if="{{item.$orig.isRight&&item.$orig.status===5}}"><view class="wrap1_4 _div data-v-c0c42e9e"><image style="width:80rpx;height:80rpx;" src="../../static/zu154@3x.png" class="data-v-c0c42e9e"></image></view></block></view></block></view></scroll-view><tabbar vue-id="541fae75-3" current="{{1}}" class="data-v-c0c42e9e" bind:__l="__l"></tabbar></view>