yangjie
/
high-mini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update-11.43

Browse Source
master
游梦婷 2 years ago
parent 5470772a76
commit 0c5aa2ba6a
8 changed files with 40 additions and 26 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      components/goods-list/goods-list.vue
  2. 8
      components/no-more/no-more.vue
  3. 9
      pages.json
  4. 3
      physical-merchants/classify/goods-search/goods-search.vue
  5. 24
      physical-merchants/classify/order/orderDetail.vue
  6. 6
      physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue
  7. 6
      physical-merchants/settleAccounts/settleAccounts.vue
  8. 4
      uni.scss

4
components/goods-list/goods-list.vue
Unescape View File

@ -109,7 +109,7 @@
</view> </view>
</view> </view>
</view> </view>
<noMore></noMore> <noMore :bgColor="'#ffffff'"></noMore>
</view> </view>
<!-- 空 --> <!-- 空 -->
<view class=" empty-content" v-else> <view class=" empty-content" v-else>
@ -243,7 +243,7 @@
}, },
deep:true, // 深度监听 deep:true, // 深度监听
immediate:false, // 初始化监听 immediate:true, // 初始化监听
}, },
}, },

8
components/no-more/no-more.vue
Unescape View File

@ -1,5 +1,5 @@
<template> <template>
<view class="nomore " :style="'font-size:'+fontSize+'px;'"> <view class="nomore " :style="'font-size:'+fontSize+'px;background:'+bgColor">
———— {{msg}} ———— ———— {{msg}} ————
</view> </view>
</template> </template>
@ -14,6 +14,10 @@
msg:{ msg:{
type:String, type:String,
default:"我是有底线的" default:"我是有底线的"
},
bgColor:{
type:String,
default:"#f6f6f6"
} }
}, },
@ -27,7 +31,7 @@
color:#ccc !important; color:#ccc !important;
padding: 40rpx; padding: 40rpx;
text-align: center; text-align: center;
background-color: #f6f6f6; /* background-color: #f6f6f6; */
} }
</style> </style>

9
pages.json
Unescape View File

@ -1093,7 +1093,9 @@
"path": "classify/goods-search/goods-search", "path": "classify/goods-search/goods-search",
"style": { "style": {
"navigationBarTitleText": "搜索", "navigationBarTitleText": "搜索",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#3da7e7",
"backgroundColorTop": "#3da7e7"
} }
}, },
{ {
@ -1142,7 +1144,10 @@
"path": "classify/order/orderDetail", "path": "classify/order/orderDetail",
"style": { "style": {
"navigationBarTitleText": "订单详情", "navigationBarTitleText": "订单详情",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#3da7e7",
"backgroundColorTop": "#3da7e7",
"navigationBarTextStyle": "white"
} }
}, },
{ {

3
physical-merchants/classify/goods-search/goods-search.vue
Unescape View File

@ -131,6 +131,7 @@
} }
.nav-search { .nav-search {
padding: 10px; padding: 20px;
background: linear-gradient(to bottom, #3da7e7, #FFFFFF) no-repeat;
} }
</style> </style>

24
physical-merchants/classify/order/orderDetail.vue
Unescape View File

@ -38,7 +38,7 @@
</view> </view>
</view> --> </view> -->
<view class="marb20 pd-main backcolorfff border-8r"> <view class=" pd-main backcolorfff border-8r">
<!-- 商品信息 --> <!-- 商品信息 -->
<view v-for="(item,index) in goodsList" :key="index" class="marb10 flex-center-sp"> <view v-for="(item,index) in goodsList" :key="index" class="marb10 flex-center-sp">
<view class=""> <view class="">
@ -126,9 +126,10 @@
<view v-else class="dis-flex flex-end">实付 <text class="font22 margle10">¥{{recinfo.payRealPrice}}</text></view> <view v-else class="dis-flex flex-end">实付 <text class="font22 margle10">¥{{recinfo.payRealPrice}}</text></view>
</view> </view>
<!-- 待支付时开始 --> <!-- 待支付时开始 -->
<!-- 订单编号 --> <!-- 订单编号 -->
<block v-if="recinfo.orderStatus == 1"> <!-- <block v-if="recinfo.orderStatus == 1">
<view class="flex-center-sp pd-tb10 bordert"> <view class="flex-center-sp pd-tb10 bordert">
<view class="fcor666 width80px">订单编号</view> <view class="fcor666 width80px">订单编号</view>
<view class=" flex-center-sp"> <view class=" flex-center-sp">
@ -136,22 +137,23 @@
<text class=" margle10 font12 copy-num fcor666" @click="copyText(orderId)">复制</text> <text class=" margle10 font12 copy-num fcor666" @click="copyText(orderId)">复制</text>
</view> </view>
</view> </view>
<!-- 下单时间 -->
<view class="flex-center-sp pd-tb10 "> <view class="flex-center-sp pd-tb10 ">
<view class="fcor666 width80px">下单时间</view> <view class="fcor666 width80px">下单时间</view>
<view class=" "> <view class=" ">
{{recinfo.createTime | formatDate('-')}} {{recinfo.createTime | formatDate('-')}}
</view> </view>
</view> </view>
<!-- 待支付时结束 -->
</block> </block>
-->
</view> </view>
<!-- 物流信息 --> <!-- 物流信息 -->
<view v-if="recinfo.orderStatus != 1 && recinfo.orderStatus != 5" class=" pd-main backcolorfff border-8r"> <view v-if="recinfo.orderStatus != 1 && recinfo.orderStatus != 5" class="pd-lr backcolorfff border-8r">
<!-- 收货信息 --> <!-- 收货信息 -->
<view class="flex-center-sp pd-tb10"> <view class="flex-center-sp pd-tb10 bordert">
<view class="fcor666 align-fs width80px">收货信息</view> <view class="fcor666 align-fs width80px">收货信息</view>
<view class="flex-1 tr"> <view class="flex-1 tr">
<view class=" "> <view class=" ">
@ -168,7 +170,7 @@
</view> </view>
</view> </view>
<!-- 订单编号 --> <!-- 订单编号 -->
<view class="flex-center-sp pd-tb10 bordert"> <view class="flex-center-sp pd-tb10 ">
<view class="fcor666 width80px">订单编号</view> <view class="fcor666 width80px">订单编号</view>
<view class=" flex-center-sp"> <view class=" flex-center-sp">
<text class="tr flex-1">{{orderId}}</text> <text class="tr flex-1">{{orderId}}</text>
@ -202,10 +204,10 @@
</view> </view>
</view> </view>
<view v-if="recinfo.orderStatus == 1 || recinfo.orderStatus == 5" class=" pd-main backcolorfff border-8r"> <view v-if="recinfo.orderStatus == 1 || recinfo.orderStatus == 5" class="pd-lr backcolorfff border-8r">
<!-- 收货信息 --> <!-- 收货信息 -->
<view class="flex-center-sp pd-tb10"> <view class="flex-center-sp pd-tb10 bordert">
<view class="fcor666 align-fs width80px">收货信息</view> <view class="fcor666 align-fs width80px">收货信息</view>
<view class="flex-1 tr"> <view class="flex-1 tr">
<view class=" "> <view class=" ">
@ -215,7 +217,7 @@
</view> </view>
</view> </view>
<!-- 订单编号 --> <!-- 订单编号 -->
<view class="flex-center-sp pd-tb10 bordert"> <view class="flex-center-sp pd-tb10 ">
<view class="fcor666 width80px">订单编号</view> <view class="fcor666 width80px">订单编号</view>
<view class=" flex-center-sp"> <view class=" flex-center-sp">
<text class="tr flex-1">{{orderId}}</text> <text class="tr flex-1">{{orderId}}</text>
@ -668,7 +670,7 @@
.btn { .btn {
height: 20px; height: 20px;
padding: 5px; padding: 5px 10px;
border-radius: 15px; border-radius: 15px;
margin-left: 15px; margin-left: 15px;
border: 1px solid #666666; border: 1px solid #666666;

6
physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue
Unescape View File

@ -16,11 +16,11 @@
</view> </view>
</view> </view>
<block v-for="(item, index) in tracesData.logisticsTraceDetails" >
<trackNode :key="index" :is-first="index===tracesData.length-1" :is-newest="index===0" :is-main-node="item.logisticsStatus!='TRANSPORT'" :node-data="item"></trackNode>
</block> <trackNode v-for="(item, index) in tracesData.logisticsTraceDetails" :key="index" :is-first="index===tracesData.length-1" :is-newest="index===0" :is-main-node="item.logisticsStatus!='TRANSPORT'" :node-data="item"></trackNode>
</view> </view>

6
physical-merchants/settleAccounts/settleAccounts.vue
Unescape View File

@ -156,7 +156,7 @@
</view> </view>
<view class=" font14"> <view class=" font14">
小计:<text class="fontwig6 font18 paddleft5">¥{{priceSettle}}</text> 小计:<text class="fontwig6 font22 paddleft5">¥{{priceSettle | numFormat}}</text>
</view> </view>
</view> </view>
</view> </view>
@ -186,8 +186,8 @@
送至: {{addressDetail.regionName+" "+addressDetail.address}} 送至: {{addressDetail.regionName+" "+addressDetail.address}}
</view> </view>
<view class="tool-right backcolorfff"> <view class="tool-right backcolorfff">
<view class="tool-jiesuan marRight10 "> <view class="tool-jiesuan marRight10 dis-flex ">
合计:<text class="fcorred">¥{{priceSettle}}</text> 合计:<text class="fcorred font22 paddleft5">¥{{priceSettle | numFormat}}</text>
</view> </view>
<view class="jiesuan-btn fcorfff" @click.stop="settleAccount"> <view class="jiesuan-btn fcorfff" @click.stop="settleAccount">
去支付 去支付

4
uni.scss
Unescape View File

@ -790,7 +790,9 @@ $uni-font-size-paragraph:30upx;
.pd-main{ .pd-main{
padding:20rpx; padding:20rpx;
} }
.pd-lr{
padding:0 20rpx;
}
/* 左悬浮 */ /* 左悬浮 */
.flleft { .flleft {
float: left; float: left;

Write Preview
Loading…
Cancel
Save