yxt_product
/
yxt-yyth-ui-miniprogram
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1111

master
guoxing 1 year ago
parent
8aa0bb02bc
commit
d897b2724a
5 changed files with 85 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      pages/cloud/detail_cloudCard.vue
  2. 18
      pages/cloud/optionalCard.vue
  3. 15
      pages/home/cloudCard.vue
  4. 69
      pages/home/pickUpCard.vue
  5. 4
      uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue

14
pages/cloud/detail_cloudCard.vue
View File

@ -1,6 +1,6 @@
1<template> 1<template>
<view style="display: flex;flex-direction: column; height: 100%;box-sizing: border-box ;" id="page"> <view style="display: flex;flex-direction: column; height: 100vh;box-sizing: border-box ; background-color: #fff;" id="page">
<view class="top"> <view class="top">
<NavBar ref="nav" navTitle="详情" :showIcon="true" :start-change-height="page.startHeight" <NavBar ref="nav" navTitle="详情" :showIcon="true" :start-change-height="page.startHeight"
@ -61,13 +61,13 @@
<view style="display: flex;flex-direction: row;height: 20px;align-items: center;"> <view style="display: flex;flex-direction: row;height: 20px;align-items: center;">
<text style="border: 1px #EE752F solid; border-radius: 10px; color:#EE752F ; font-size: 10px; <text style="border: 1px #EE752F solid; border-radius: 10px; color:#EE752F ; font-size: 10px;
margin-right: 20px;padding: 0px 5px;">{{item.jprice}}元/{{item.specificationUnit}}</text> margin-right: 20px;padding: 0px 5px;">{{convertPrice(item.jprice)}}元/{{item.specificationUnit}}</text>
<text <text
style="border: 1px #EE752F solid; border-radius: 10px; color: #EE752F;font-size: 10px;;padding: 0px 5px;">{{item.weight}}斤/{{item.unitName}}</text> style="border: 1px #EE752F solid; border-radius: 10px; color: #EE752F;font-size: 10px;;padding: 0px 5px;">{{item.weight}}斤/{{item.unitName}}</text>
</view> </view>
<text style="color: #FF5006;font-size: 15px;">￥{{item.totalValue}}</text> <text style="color: #FF5006;font-size: 15px;">￥{{convertPrice(item.totalValue)}}</text>
</view> </view>
@ -79,23 +79,23 @@
</view> </view>
</view> </view>
<view v-show="data.goods.length>0" style="height: 100px;background: #f1f2f3; "></view> <view style="height: 100px;background: #fff; "></view>
<view style="background-color: #fff; padding: 10px 20px;position: fixed;bottom: 0;overflow:hidden; <view style="background-color: #fff; padding: 10px 20px;position: fixed;bottom: 0;overflow:hidden;
display: flex;flex-direction: row; width: 100%;flex-shrink: 1;"> display: flex;flex-direction: row; width: 100%;flex-shrink: 1; border-top: 1px #F0F0F0 solid;">
<view style="flex: 1; display: flex;flex-direction: row;align-items: center; margin-right: 30px; <view style="flex: 1; display: flex;flex-direction: row;align-items: center; margin-right: 30px;
justify-content: space-between;"> justify-content: space-between;">
<view style="display: flex;flex-direction: row;align-items: center;"> <view style="display: flex;flex-direction: row;align-items: center;">
<text style="color: #888;font-size: 14px;">合计：</text> <text style="color: #888;font-size: 14px;">合计：</text>
<text style="color: #F0752F;font-size: 18px;">{{page.price}}元</text> <text style="color: #F0752F;font-size: 18px;">{{convertPrice(page.price)}}元</text>
</view> </view>
</view> </view>
<text <text
style="background: #EE752F; text-align: center; color: #fff; border-radius: 5px;padding: 5px 20px; margin-right: 40px; " style="background: #EE752F; text-align: center; color: #fff; border-radius: 5px;padding: 5px 20px; margin-right: 40px; "
@click="settlement()">结算</text> @click="settlement()">结算入窖</text>
</view> </view>

18
pages/cloud/optionalCard.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view style="display: flex;flex-direction: column; height: 100%;box-sizing: border-box;" id="page"> <view style="display: flex;flex-direction: column; height: 100vh;box-sizing: border-box; background-color: #fff;" id="page">
<view class="top"> <view class="top">
<NavBar ref="nav" navTitle="详情" :showIcon="true" :start-change-height="page.startHeight" <NavBar ref="nav" navTitle="详情" :showIcon="true" :start-change-height="page.startHeight"
@ -46,7 +46,7 @@
<view <view
style=" display: flex;flex-direction: row;align-items: center; margin-right: 10px;margin-top: 5px; margin-left: 10px;"> style=" display: flex;flex-direction: row;align-items: center; margin-right: 10px;margin-top: 5px; margin-left: 10px;">
<image :src='item.iconUrl' style="width: 70px;height: 70px;" mode="aspectFill"></image> <image :src='item.iconUrl' style="width: 70px;height: 70px;" mode="aspectFit"></image>
<view style="display: flex;flex-direction: column;margin-left: 20px;width: 100%;"> <view style="display: flex;flex-direction: column;margin-left: 20px;width: 100%;">
@ -64,15 +64,15 @@
<view <view
style="display: flex;flex-direction: row;justify-content:space-between;margin-top: 5px;"> style="display: flex;flex-direction: row;justify-content:space-between;margin-top: 5px;">
<view style="display: flex;flex-direction: row;"> <view style="display: flex;flex-direction: row;height: 20px;align-items: center;">
<text style="border: 1px #EE752F solid; border-radius: 10px; color:#EE752F ; font-size: 10px; <text style="border: 1px #EE752F solid; border-radius: 10px; color:#EE752F ; font-size: 10px;
margin-right: 20px;padding: 0px 5px;">{{item.jprice}}元/{{item.specificationUnit}}</text> margin-right: 20px;padding: 0px 5px;">{{convertPrice(item.jprice)}}元/{{item.specificationUnit}}</text>
<text <text
style="border: 1px #EE752F solid; border-radius: 10px; color: #EE752F;font-size: 10px;;padding: 0px 5px;">{{item.weight}}斤/{{item.unitName}}</text> style="border: 1px #EE752F solid; border-radius: 10px; color: #EE752F;font-size: 10px;;padding: 0px 5px;">{{item.weight}}斤/{{item.unitName}}</text>
</view> </view>
<text style="color: #FF5006;font-size: 15px;">￥{{item.price}}</text> <text style="color: #FF5006;font-size: 15px;">￥{{convertPrice(item.price)}}</text>
</view> </view>
@ -82,9 +82,11 @@
</view> </view>
</view> </view>
<view v-show="data.length>0" style="height: 100px;background: #f1f2f3; "></view> <view style="height: 200px;background: #fff; "></view>
<view style="background-color: #fff;position: fixed;bottom: 0;overflow:hidden; <view style="background-color: #fff;position: fixed;bottom: 0;overflow:hidden;
display: flex;flex-direction: column; width: 100%;flex-shrink: 1;"> display: flex;flex-direction: column; width: 100%;flex-shrink: 1;">
@ -103,14 +105,14 @@
<view style="display: flex;flex-direction: row;align-items: center;"> <view style="display: flex;flex-direction: row;align-items: center;">
<text style="color: #888;font-size: 14px;">合计：</text> <text style="color: #888;font-size: 14px;">合计：</text>
<text style="color: #F0752F;font-size: 18px;">{{page.price}}元</text> <text style="color: #F0752F;font-size: 18px;">{{convertPrice(page.price)}}元</text>
</view> </view>
</view> </view>
<text <text
style="background: #EE752F; text-align: center; color: #fff; border-radius: 5px;padding: 5px 20px; margin-right: 40px; " style="background: #EE752F; text-align: center; color: #fff; border-radius: 5px;padding: 5px 20px; margin-right: 40px; "
@click="settlement()">结算</text> @click="settlement()">结算入窖</text>
</view> </view>

15
pages/home/cloudCard.vue
View File

@ -6,9 +6,9 @@
<NavBar ref="nav" navTitle=" " :showIcon="false" :start-change-height="page.startHeight" <NavBar ref="nav" navTitle=" " :showIcon="false" :start-change-height="page.startHeight"
:end-change-height="page.endHeight"> :end-change-height="page.endHeight">
</NavBar> </NavBar>
<view class="topText"> <!-- <view class="topText">
冬储文化是中国传统文化的一部分，是古人顺应自然、因时而食的智慧体现，是刻在老一辈骨子里的温暖记忆! 冬储文化是中国传统文化的一部分，是古人顺应自然、因时而食的智慧体现，是刻在老一辈骨子里的温暖记忆!
</view> </view> -->
</view> </view>
<!-- <view <!-- <view
@ -48,7 +48,7 @@
<view style="display: flex;flex-direction: row;align-items: center; margin-right: 10px;margin-top: 5px; width: 100%; "> <view style="display: flex;flex-direction: row;align-items: center; margin-right: 10px;margin-top: 5px; width: 100%; ">
<image :src='item.iconUrl' style="width: 60px;height: 70px;"></image> <image :src='item.iconUrl' style="width: 70px;height: 70px;" mode="aspectFit"></image>
<view style="display: flex;flex-direction: column;margin-left: 20px;flex: 1; width: 100%;"> <view style="display: flex;flex-direction: column;margin-left: 20px;flex: 1; width: 100%;">
@ -66,7 +66,7 @@
</view> </view>
<text style="color: #FF5006;font-size: 14px;">￥{{this.convertPrice(item.price) }}</text> <text style="color: #FF5006;font-size: 14px;">￥{{convertPrice(item.price)}}</text>
</view> </view>
@ -92,9 +92,9 @@
styleObject: { styleObject: {
// 'position': 'fixed', // 'position': 'fixed',
// 'top':'80vw', // 'top':'80vw',
'margin-top': '78vw', 'margin-top': '68vw',
// 'border-top-left-radius': '25px', 'border-top-left-radius': '25px',
// 'border-top-right-radius': '25px', 'border-top-right-radius': '25px',
'background': '#fff', 'background': '#fff',
'padding-top': '10px', 'padding-top': '10px',
}, },
@ -133,6 +133,7 @@
_this.$api.appletGiftBagList().then((resp) => { _this.$api.appletGiftBagList().then((resp) => {
// 添加数据源 // 添加数据源
// this.$refs.paging.complete(resp.records) // this.$refs.paging.complete(resp.records)
this.$refs.paging.complete(resp) this.$refs.paging.complete(resp)
}).catch(e => { }).catch(e => {
// 出错了，点击重试 // 出错了，点击重试

69
pages/home/pickUpCard.vue
View File

@ -77,19 +77,26 @@
{{item.state}}</text> {{item.state}}</text>
</view> </view>
<view style="height: 10px;"></view> <view v-if="item.list.length>0">
<view style="height: 10px;"></view>
<view v-for="(child,pos) in item.list" :key="pos"
style="display: flex;flex-direction: row;align-items: center;width: calc(100vw - 120px);padding-top: 5px;"> <view v-for="(child,pos) in item.list" :key="pos"
<image src="../../static/tck_mx_icon.png" style="width: 9px;height: 9px;"></image> style="display: flex;flex-direction: row;align-items: center;width: calc(100vw - 120px);padding-top: 5px;">
<view <image src="../../static/tck_mx_icon.png" style="width: 9px;height: 9px;">
style="font-size: 11px;color: #E99D42;padding-left: 5px;flex: 1;overflow: hidden;text-overflow: ellipsis;white-space: nowrap"> </image>
{{child.goodsName}}</view> <view
<view style="font-size: 11px;color: #E99D42;flex-shrink: 0;margin-left: 23px;"> style="font-size: 11px;color: #E99D42;padding-left: 5px;flex: 1;overflow: hidden;text-overflow: ellipsis;white-space: nowrap">
{{child.content}}</view> {{child.goodsName}}
<view style="font-size: 11px;color: #E99D42;flex-shrink: 0;margin-left: 23px;">{{child.remarks}} </view>
<view style="font-size: 11px;color: #E99D42;flex-shrink: 0;margin-left: 23px;">
{{child.content}}
</view>
<view style="font-size: 11px;color: #E99D42;flex-shrink: 0;margin-left: 23px;">
{{child.remarks}}
</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
@ -145,6 +152,27 @@
{{item.state}}</text> {{item.state}}</text>
</view> </view>
<view v-if="item.list.length>0">
<view style="height: 10px;"></view>
<view v-for="(child,pos) in item.list" :key="pos"
style="display: flex;flex-direction: row;align-items: center;width: calc(100vw - 120px);padding-top: 5px;">
<image src="../../static/tck_mx_icon.png" style="width: 9px;height: 9px;">
</image>
<view
style="font-size: 11px;color: #E99D42;padding-left: 5px;flex: 1;overflow: hidden;text-overflow: ellipsis;white-space: nowrap">
{{child.goodsName}}
</view>
<view style="font-size: 11px;color: #E99D42;flex-shrink: 0;margin-left: 23px;">
{{child.content}}
</view>
<view style="font-size: 11px;color: #E99D42;flex-shrink: 0;margin-left: 23px;">
{{child.remarks}}
</view>
</view>
</view>
</view> </view>
</view> </view>
@ -200,6 +228,25 @@
style="margin-left: 10px;border-radius: 15px;padding: 3px 10px; font-size: 12px; color: #FF6000;flex-shrink: 0;"> style="margin-left: 10px;border-radius: 15px;padding: 3px 10px; font-size: 12px; color: #FF6000;flex-shrink: 0;">
{{item.state}}</text> {{item.state}}</text>
</view> </view>
<view v-if="item.list.length>0">
<view style="height: 10px;"></view>
<view v-for="(child,pos) in item.list" :key="pos"
style="display: flex;flex-direction: row;align-items: center;width: calc(100vw - 120px);padding-top: 5px;">
<image src="../../static/tck_mx_icon.png" style="width: 9px;height: 9px;">
</image>
<view
style="font-size: 11px;color: #E99D42;padding-left: 5px;flex: 1;overflow: hidden;text-overflow: ellipsis;white-space: nowrap">
{{child.goodsName}}
</view>
<view style="font-size: 11px;color: #E99D42;flex-shrink: 0;margin-left: 23px;">
{{child.content}}
</view>
<view style="font-size: 11px;color: #E99D42;flex-shrink: 0;margin-left: 23px;">
{{child.remarks}}
</view>
</view>
</view>
</view> </view>

4
uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
View File

@ -216,9 +216,9 @@
.uni-numbox--text { .uni-numbox--text {
// fix nvue // fix nvue
line-height: 30px; line-height: 20px;
font-size: 40px; font-size: 30px;
font-weight: 300; font-weight: 300;
color: $color; color: $color;
} }

Write Preview
Loading…
Cancel
Save