product_platform/yxt-yyth-ui-miniprogram
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1111

Browse Source
This commit is contained in:
guoxing
2024-01-09 19:11:51 +08:00
parent 87b43ecf32
commit b7a264c138
7 changed files with 64 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages.json
View File

@@ -296,7 +296,7 @@
// } // }
{ {
"pagePath": "pages/home/cloudCard", "pagePath": "pages/home/cloudCard",
"text": "云选菜窖", "text": "选菜窖",
"iconPath": "static/bomicon/bom_notCloudCard.png", "iconPath": "static/bomicon/bom_notCloudCard.png",
"selectedIconPath": "static/bomicon/bom_cloudCard.png" "selectedIconPath": "static/bomicon/bom_cloudCard.png"
}, },

2
pages/cloud/detail_cloudCard.vue
View File

@@ -54,7 +54,7 @@
</view> </view>
<text style="color: #AEAEAE;font-size: 12px;margin-top: 5px;">{{item.remark}}</text> <text style="color: #AEAEAE;font-size: 12px;margin-top: 5px;line-height: 20px;">{{item.remark}}</text>
<view <view
style="display: flex;flex-direction: row;justify-content:space-between;margin-top: 5px;align-items: center;"> style="display: flex;flex-direction: row;justify-content:space-between;margin-top: 5px;align-items: center;">

6
pages/cloud/optionalCard.vue
View File

@@ -24,7 +24,7 @@
<view style="background: #FF9900; border-radius: 50%;width: 12px;height: 12px;"></view> <view style="background: #FF9900; border-radius: 50%;width: 12px;height: 12px;"></view>
<view style="background: #FFCC7F; border-radius: 50%;width: 12px;height: 12px;"></view> <view style="background: #FFCC7F; border-radius: 50%;width: 12px;height: 12px;"></view>
<text <text
style="margin-left: 8px;font-size: 16px;color: #FF9900;font-weight: 600;font-family: sans-serif;">自选云菜窖</text> style="margin-left: 8px;font-size: 16px;color: #FF9900;font-weight: 600;font-family: sans-serif;">自选组合</text>
</view> </view>
<view style="display: flex;flex-direction: row;align-items: center;margin-right: 10px;"> <view style="display: flex;flex-direction: row;align-items: center;margin-right: 10px;">
@@ -52,14 +52,14 @@
<view style="display: flex;flex-direction: row;align-items: center;"> <view style="display: flex;flex-direction: row;align-items: center;">
<text <text
style="flex: 1;margin-right: 10px;color: #000;font-size: 16px;">{{item.name}}</text> style="flex: 1;margin-right: 10px;color: #000;font-size: 14px;">{{item.name}}</text>
<uni-number-box ref="box" :showTextView="true" background="#fff" <uni-number-box ref="box" :showTextView="true" background="#fff"
v-model="item.goodsNumber" @change="numberChange($event,item)"></uni-number-box> v-model="item.goodsNumber" @change="numberChange($event,item)"></uni-number-box>
</view> </view>
<text style="color: #AEAEAE;font-size: 14px;margin-top: 5px;">{{item.remark}}</text> <text style="color: #AEAEAE;font-size: 14px;margin-top: 5px;line-height: 20px;">{{item.remark}}</text>
<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;">

58
pages/home/cloudCard.vue
View File

@@ -16,7 +16,7 @@
--> -->
<z-paging ref="paging" v-model="data" :pagingStyle='styleObject' @query="queryList" :refresher-enabled="true"> <z-paging ref="paging" v-model="data" :pagingStyle='styleObject' @query="queryList" :refresher-enabled="true" >
<view style="display: flex;flex-direction: row;justify-content: space-between; <view style="display: flex;flex-direction: row;justify-content: space-between;
margin:5px 20px 0px 20px;padding-bottom: 10px; border-bottom: 2px #EFEFEF solid;"> margin:5px 20px 0px 20px;padding-bottom: 10px; border-bottom: 2px #EFEFEF solid;">
@@ -24,13 +24,13 @@
<view style="background: #FF9900; border-radius: 50%;width: 12px;height: 12px;"></view> <view style="background: #FF9900; border-radius: 50%;width: 12px;height: 12px;"></view>
<view style="background: #FFCC7F; border-radius: 50%;width: 12px;height: 12px;"></view> <view style="background: #FFCC7F; border-radius: 50%;width: 12px;height: 12px;"></view>
<text <text
style="margin-left: 8px;font-size: 16px;color: #FF9900;font-weight: 600;font-family: sans-serif;">家庭云菜窖</text> style="margin-left: 8px;font-size: 16px;color: #FF9900;font-weight: 600;font-family: sans-serif;">精选蔬菜组合</text>
</view> </view>
<view style="border: 1px #FF9900 solid;font-size: 16px;color: #FF9900;font-weight: 600;font-family: sans-serif;border-radius: 15px; <!-- <view style="border: 1px #FF9900 solid;font-size: 16px;color: #FF9900;font-weight: 600;font-family: sans-serif;border-radius: 15px;
padding:5px 15px;" @click="optionalClick()"> padding:5px 15px;" @click="optionalClick()">
+ 自选菜窖 + 自选菜窖
</view> </view> -->
</view> </view>
@@ -43,18 +43,23 @@
<view style="display: flex;flex-direction: row;width: 100%; "> <view style="display: flex;flex-direction: row;width: 100%; ">
<text style="flex: 1;margin-right: 10px;color: #000;font-size: 16px;">{{item.name}}</text> <text style="flex: 1;margin-right: 10px;color: #000;font-size: 16px;">{{item.name}}</text>
<view style="display: flex;flex-direction: row;align-items: center;">
<text style="color: #FCA45C; font-size: 12px;margin-right: 5px;">订窖</text>
<image src="@/static/right_icon.png" style="width: 15px;height: 15px;"></image> <image src="@/static/right_icon.png" style="width: 15px;height: 15px;"></image>
</view> </view>
</view>
<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: 70px;height: 70px;" mode="aspectFit"></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%; margin-top: 5px;">
<text style="color: #999;font-size: 14px;width: 100%;">{{item.remarks}}</text> <text style="color: #999;font-size: 13px;width: 100%;line-height: 20px;">{{item.remarks}}</text>
<view style="display: flex;flex-direction: row;justify-content:space-between;margin-top: 5px;"> <view style="display: flex;flex-direction: row;justify-content:space-between;margin-top: 10px;">
<view style="display: flex;flex-direction: row;"> <view style="display: flex;flex-direction: row;">
<text <text
@@ -62,7 +67,7 @@
margin-right: 10px;padding: 0px 8px;" margin-right: 10px;padding: 0px 8px;"
v-show="item.isRecommend=='1'">推荐</text> v-show="item.isRecommend=='1'">推荐</text>
<text <text
style="border: 1px #EE752F solid; border-radius: 10px; color: #EE752F;font-size: 14px;;padding: 0px 8px;">{{item.count}}</text> style="border: 1px #EE752F solid; border-radius: 10px; color: #EE752F;font-size: 12px;;padding: 0px 8px;">{{item.count}}</text>
</view> </view>
@@ -70,7 +75,26 @@
</view> </view>
<view v-if="item.giftBagGoods.length>0">
<view style="height: 10px;"></view>
<view v-for="(child,pos) in item.giftBagGoods" :key="pos"
style="display: flex;flex-direction: row;align-items: center;width: calc(100vw - 120px);padding-top: 5px;box-sizing: border-box;">
<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.name}}
</view> </view>
<view style="font-size: 11px;color: #E99D42;flex-shrink: 0;margin-left: 23px;">
{{child.count}}
</view>
<view style="font-size: 11px;color: #E99D42;min-width: 60px;text-align: right;padding-left: 5px;">
{{child.spec}}
</view>
</view>
</view>
</view> </view>
@@ -78,6 +102,21 @@
</view> </view>
</view> </view>
</view>
<view slot="loadingMoreNoMore">
<view style="display: flex;flex-direction: column;justify-content: center; align-items: center; margin-top: 20px; border-top: 2px #efefef solid;
padding-top: 20px; margin-left:20px;margin-right: 20px;;">
<text style="color: #888888; font-size: 13px;">您也可以自由选菜，自建惠享云菜窖。</text>
<text style="color: #fff; font-size: 16px; font-weight: 600; font-family: sans-serif; background: #FCA45C; border-radius: 8px; padding: 10px 15px; margin-top: 15px;;" @click="optionalClick()">自建云菜窖</text>
</view>
<view style="height: 20px;"></view>
</view>
</z-paging> </z-paging>
<!-- </view> --> <!-- </view> -->
@@ -97,6 +136,7 @@
'border-top-right-radius': '25px', 'border-top-right-radius': '25px',
'background': '#fff', 'background': '#fff',
'padding-top': '10px', 'padding-top': '10px',
}, },
page: { page: {
startHeight: 0, startHeight: 0,
@@ -165,7 +205,7 @@
.top { .top {
width: 100vw; width: 100vw;
/* height: 126.66vw; */ /* height: 126.66vw; */
height: 85vw; height: 75vw;
/* 加载背景图 */ /* 加载背景图 */
background-image: url(https://supervise.yxtsoft.com/lpk/image/clound_bj1.png); background-image: url(https://supervise.yxtsoft.com/lpk/image/clound_bj1.png);
/* background-image: url(../../static/clound_bj1.png); */ /* background-image: url(../../static/clound_bj1.png); */

9
pages/home/pickUpCard.vue
View File

@@ -156,7 +156,7 @@
<view style="height: 10px;"></view> <view style="height: 10px;"></view>
<view v-for="(child,pos) in item.list" :key="pos" <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;"> style="display: flex;flex-direction: row;align-items: center;width: calc(100vw - 120px);padding-top: 5px;box-sizing: border-box;">
<image src="../../static/tck_mx_icon.png" style="width: 9px;height: 9px;"> <image src="../../static/tck_mx_icon.png" style="width: 9px;height: 9px;">
</image> </image>
<view <view
@@ -166,7 +166,7 @@
<view style="font-size: 11px;color: #E99D42;flex-shrink: 0;margin-left: 23px;"> <view style="font-size: 11px;color: #E99D42;flex-shrink: 0;margin-left: 23px;">
{{child.content}} {{child.content}}
</view> </view>
<view style="font-size: 11px;color: #E99D42;flex-shrink: 0;margin-left: 23px;"> <view style="font-size: 11px;color: #E99D42;min-width: 60px;text-align: right;padding-left: 5px;">
{{child.remarks}} {{child.remarks}}
</view> </view>
</view> </view>
@@ -232,7 +232,7 @@
<view style="height: 10px;"></view> <view style="height: 10px;"></view>
<view v-for="(child,pos) in item.list" :key="pos" <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;"> style="display: flex;flex-direction: row;align-items: center;width: calc(100vw - 120px);padding-top: 5px;box-sizing: border-box;">
<image src="../../static/tck_mx_icon.png" style="width: 9px;height: 9px;"> <image src="../../static/tck_mx_icon.png" style="width: 9px;height: 9px;">
</image> </image>
<view <view
@@ -242,7 +242,7 @@
<view style="font-size: 11px;color: #E99D42;flex-shrink: 0;margin-left: 23px;"> <view style="font-size: 11px;color: #E99D42;flex-shrink: 0;margin-left: 23px;">
{{child.content}} {{child.content}}
</view> </view>
<view style="font-size: 11px;color: #E99D42;flex-shrink: 0;margin-left: 23px;"> <view style="font-size: 11px;color: #E99D42;min-width: 60px;text-align: right;padding-left: 5px;">
{{child.remarks}} {{child.remarks}}
</view> </view>
</view> </view>
@@ -421,6 +421,7 @@
} }
.item { .item {
border-radius: 8px;
width: calc(100% - 5px); width: calc(100% - 5px);
background-color: rgba(255, 248, 248, 1); background-color: rgba(255, 248, 248, 1);
color: rgba(16, 16, 16, 1); color: rgba(16, 16, 16, 1);

2
pages/login/login.vue
View File

@@ -102,7 +102,7 @@
}).catch(e => { }).catch(e => {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '绑卡时发生错误', content: e.msg,
showCancel: false, showCancel: false,
success: function(res) { success: function(res) {
uni.switchTab({ uni.switchTab({

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

@@ -164,7 +164,7 @@
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
$box-height: 26px; $box-height: 20px;
$bg: #f5f5f5; $bg: #f5f5f5;
$br: 2px; $br: 2px;
$color: #333; $color: #333;
@@ -184,7 +184,6 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
padding: 0 8px;
background-color: $bg; background-color: $bg;
/* #ifdef H5 */ /* #ifdef H5 */
cursor: pointer; cursor: pointer;
@@ -192,9 +191,8 @@
} }
.uni-numbox__value { .uni-numbox__value {
margin: 0 2px;
background-color: $bg; background-color: $bg;
width: 40px; width: 30px;
height: $box-height; height: $box-height;
line-height: $box-height; line-height: $box-height;
text-align: center; text-align: center;