Merge remote-tracking branch 'origin/main' into main
26947
commit
cd4c17d3ee
127
pages.json
127
pages.json
|
|
@ -7,7 +7,27 @@
|
|||
"^u-([^-].*)": "uview-plus/components/u-$1/u-$1.vue"
|
||||
}
|
||||
},
|
||||
"pages": [
|
||||
"pages": [{
|
||||
"path": "pages/signln/harvestaddress",
|
||||
"style": {
|
||||
"navigationBarTitleText": "收货地址",
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/signln/exdetail",
|
||||
"style": {
|
||||
"navigationBarTitleText": "兑换商城详情",
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/signln/successfulexchange",
|
||||
"style": {
|
||||
"navigationBarTitleText": "兑换成功",
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/index",
|
||||
"style": {
|
||||
|
|
@ -18,8 +38,7 @@
|
|||
},
|
||||
{
|
||||
"path": "pages/signln/signid",
|
||||
"style" :
|
||||
{
|
||||
"style": {
|
||||
"navigationBarTitleText": "签到任务",
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
|
|
@ -34,22 +53,11 @@
|
|||
},
|
||||
{
|
||||
"path": "pages/signln/exchangemall",
|
||||
"style" :
|
||||
{
|
||||
"style": {
|
||||
"navigationBarTitleText": "兑换商城",
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/signln/exdetail",
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText" : "兑换商城详情",
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
{
|
||||
"path": "pages/common/talkState/publish",
|
||||
"style": {
|
||||
|
|
@ -74,10 +82,6 @@
|
|||
"navigationBarTextStyle": "white"
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
|
||||
|
||||
{
|
||||
"path": "pages/loginInfo/login",
|
||||
"style": {
|
||||
|
|
@ -89,52 +93,56 @@
|
|||
"style": {
|
||||
"navigationBarTitleText": "注册"
|
||||
}
|
||||
}
|
||||
, {
|
||||
},
|
||||
{
|
||||
"path": "pages/activity/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "活动",
|
||||
"navigationStyle": "custom",
|
||||
"navigationBarTextStyle": "white"
|
||||
}
|
||||
}
|
||||
, {
|
||||
},
|
||||
{
|
||||
"path": "pages/activity/info",
|
||||
"style": {
|
||||
"navigationBarTitleText": "活动详情",
|
||||
"navigationStyle": "custom",
|
||||
"navigationBarTextStyle": "white"
|
||||
}
|
||||
}
|
||||
, {
|
||||
},
|
||||
{
|
||||
"path": "pages/activity/publish",
|
||||
"style": {
|
||||
"navigationBarTitleText": "发布活动",
|
||||
"navigationStyle": "custom",
|
||||
"navigationBarTextStyle": "white"
|
||||
}
|
||||
}
|
||||
, {
|
||||
},
|
||||
{
|
||||
"path": "pages/work/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "工作台"
|
||||
}
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"path": "pages/mine/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "我的"
|
||||
}
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"path": "pages/mine/avatar/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "修改头像"
|
||||
}
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"path": "pages/mine/info/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "个人信息"
|
||||
}
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"path": "pages/mine/info/edit",
|
||||
"style": {
|
||||
"navigationBarTitleText": "编辑资料"
|
||||
|
|
@ -151,32 +159,38 @@
|
|||
"style": {
|
||||
"navigationBarTitleText": "修改密码"
|
||||
}
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"path": "pages/mine/setting/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "应用设置"
|
||||
}
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"path": "pages/mine/help/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "常见问题"
|
||||
}
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"path": "pages/mine/about/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "关于我们"
|
||||
}
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"path": "pages/common/webview/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "浏览网页"
|
||||
}
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"path": "pages/common/textview/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "浏览文本"
|
||||
}
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"path": "pages/search/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "搜索"
|
||||
|
|
@ -187,15 +201,32 @@
|
|||
"style": {
|
||||
"navigationBarTitleText": "添加好友"
|
||||
}
|
||||
}
|
||||
// {
|
||||
// "path": "pages/signln/signiddetails",
|
||||
// "style": {
|
||||
// "navigationBarTitleText": "签到明细",
|
||||
// "navigationStyle": "custom"
|
||||
// }
|
||||
},
|
||||
|
||||
// }
|
||||
{
|
||||
"path": "pages/common/navbar/navbar_nead",
|
||||
"style": {
|
||||
"navigationBarTitleText": "navbar"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/Friend/messagenotification",
|
||||
"style": {
|
||||
"navigationBarTitleText": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/Friend/addfruebd",
|
||||
"style": {
|
||||
"navigationBarTitleText": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/common/exchange/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": ""
|
||||
}
|
||||
}
|
||||
],
|
||||
"tabBar": {
|
||||
"color": "#000000",
|
||||
|
|
@ -207,14 +238,12 @@
|
|||
"iconPath": "static/images/tabbar/home.png",
|
||||
"selectedIconPath": "static/images/tabbar/home_.png",
|
||||
"text": "首页"
|
||||
}
|
||||
, {
|
||||
}, {
|
||||
"pagePath": "pages/activity/index",
|
||||
"iconPath": "static/images/tabbar/tu1-4.png",
|
||||
"selectedIconPath": "static/images/tabbar/tu1-3.png",
|
||||
"text": "活动"
|
||||
}
|
||||
, {
|
||||
}, {
|
||||
"pagePath": "pages/work/index",
|
||||
"iconPath": "static/images/tabbar/work.png",
|
||||
"selectedIconPath": "static/images/tabbar/work_.png",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,204 @@
|
|||
<!-- 兑换商城 -->
|
||||
<template class="content">
|
||||
<view class="cp">
|
||||
<view class="view-content" v-for="(item,index) in arr" :key="index">
|
||||
<view class="content-main">
|
||||
<view class="content-image">
|
||||
<image :src="item.src"></image>
|
||||
</view>
|
||||
<view class="content-text">
|
||||
<view class="text1">
|
||||
{{item.content}}
|
||||
</view>
|
||||
<view class="text-flex">
|
||||
|
||||
<view class="text2">
|
||||
兑换所需
|
||||
</view>
|
||||
|
||||
<view class="text3">
|
||||
<image src="../../static/images/sign/1.png"></image>
|
||||
<text>{{item.count}}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {
|
||||
ref,
|
||||
reactive
|
||||
} from "vue";
|
||||
|
||||
const count = ref("750");
|
||||
|
||||
let arr = reactive([{
|
||||
id: 1,
|
||||
src: "https://cbu01.alicdn.com/img/ibank/2019/524/629/11890926425_297889188.jpg",
|
||||
content: "[端午礼盒] 西凤酒52度头曲礼盒 陕西凤香型白酒礼11111111111",
|
||||
count: 700
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
src: "https://cbu01.alicdn.com/img/ibank/2016/442/823/3216328244_1451018438.jpg",
|
||||
content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111 ",
|
||||
count: 200
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
src: "https://ts1.cn.mm.bing.net/th/id/R-C.2bcea282254788c581f0a18f47efb5f8?rik=rcZeIVRgTcWUkQ&riu=http%3a%2f%2fhimg2.huanqiu.com%2fattachment2010%2f2019%2f0429%2f10%2f58%2f20190429105829589.jpg&ehk=HCIAZrOId0EVKf%2bFyNg7cgff6Cg8WLUCNHpaDgwi1ng%3d&risl=&pid=ImgRaw&r=0",
|
||||
content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111 ",
|
||||
count: 500
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
src: "https://ts1.cn.mm.bing.net/th/id/R-C.2bcea282254788c581f0a18f47efb5f8?rik=rcZeIVRgTcWUkQ&riu=http%3a%2f%2fhimg2.huanqiu.com%2fattachment2010%2f2019%2f0429%2f10%2f58%2f20190429105829589.jpg&ehk=HCIAZrOId0EVKf%2bFyNg7cgff6Cg8WLUCNHpaDgwi1ng%3d&risl=&pid=ImgRaw&r=0",
|
||||
content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111 ",
|
||||
count: 500
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
src: "https://ts1.cn.mm.bing.net/th/id/R-C.2bcea282254788c581f0a18f47efb5f8?rik=rcZeIVRgTcWUkQ&riu=http%3a%2f%2fhimg2.huanqiu.com%2fattachment2010%2f2019%2f0429%2f10%2f58%2f20190429105829589.jpg&ehk=HCIAZrOId0EVKf%2bFyNg7cgff6Cg8WLUCNHpaDgwi1ng%3d&risl=&pid=ImgRaw&r=0",
|
||||
content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111 ",
|
||||
count: 500
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
src: "https://ts1.cn.mm.bing.net/th/id/R-C.2bcea282254788c581f0a18f47efb5f8?rik=rcZeIVRgTcWUkQ&riu=http%3a%2f%2fhimg2.huanqiu.com%2fattachment2010%2f2019%2f0429%2f10%2f58%2f20190429105829589.jpg&ehk=HCIAZrOId0EVKf%2bFyNg7cgff6Cg8WLUCNHpaDgwi1ng%3d&risl=&pid=ImgRaw&r=0",
|
||||
content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111 ",
|
||||
count: 500
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
src: "https://ts1.cn.mm.bing.net/th/id/R-C.2bcea282254788c581f0a18f47efb5f8?rik=rcZeIVRgTcWUkQ&riu=http%3a%2f%2fhimg2.huanqiu.com%2fattachment2010%2f2019%2f0429%2f10%2f58%2f20190429105829589.jpg&ehk=HCIAZrOId0EVKf%2bFyNg7cgff6Cg8WLUCNHpaDgwi1ng%3d&risl=&pid=ImgRaw&r=0",
|
||||
content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111 ",
|
||||
count: 500
|
||||
},
|
||||
]);
|
||||
|
||||
function return_left() {
|
||||
console.log("返回事件")
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.content {
|
||||
background: #faf9fa;
|
||||
}
|
||||
|
||||
.view-top {
|
||||
/* height: 100rpx; */
|
||||
}
|
||||
|
||||
.view-top-rigth-text {
|
||||
margin-top: 24rpx;
|
||||
margin-left: 479rpx;
|
||||
margin-right: 32rpx;
|
||||
}
|
||||
|
||||
.view-top-rigth-text>text {
|
||||
font-weight: Regular;
|
||||
width: 239rpx;
|
||||
height: 31rpx;
|
||||
font-size: 30rpx;
|
||||
text-align: left;
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
|
||||
.cp {
|
||||
display: grid;
|
||||
grid-template-columns: auto auto;
|
||||
margin-left: 32rpx;
|
||||
margin-right: 32rpx;
|
||||
margin-top: 23rpx;
|
||||
grid-column-gap: 26rpx;
|
||||
grid-row-gap: 24rpx;
|
||||
}
|
||||
|
||||
.view-content {
|
||||
width: 330rpx;
|
||||
height: 482rpx;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.content-main {
|
||||
width: 330rpx;
|
||||
height: 482rpx;
|
||||
border-radius: 24rpx 24rpx 24rpx 24rpx;
|
||||
background: #ffffff;
|
||||
}
|
||||
|
||||
.content-image>image {
|
||||
width: 330rpx;
|
||||
height: 330rpx;
|
||||
border-radius: 24rpx 24rpx 0 0;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.content-text {
|
||||
margin-left: 24rpx;
|
||||
margin-top: 24rpx;
|
||||
}
|
||||
|
||||
.text1 {
|
||||
font-weight: Regular;
|
||||
width: 266rpx;
|
||||
height: 54rpx;
|
||||
line-height: 27rpx;
|
||||
font-size: 22rpx;
|
||||
text-align: left;
|
||||
color: #000000;
|
||||
|
||||
overflow: hidden;
|
||||
word-wrap: break-word;
|
||||
text-overflow: ellipsis;
|
||||
display: -webkit-box;
|
||||
-webkit-box-orient: vertical;
|
||||
-webkit-line-clamp: 2;
|
||||
|
||||
}
|
||||
|
||||
.text-flex {
|
||||
margin-top: 28rpx;
|
||||
width: 330rpx;
|
||||
height: 20rpx;
|
||||
}
|
||||
|
||||
.text2 {
|
||||
font-weight: Regular;
|
||||
width: 100rpx;
|
||||
height: 20rpx;
|
||||
font-size: 20rpx;
|
||||
text-align: left;
|
||||
color: #999999;
|
||||
line-height: 20rpx;
|
||||
align-items: center;
|
||||
float: left;
|
||||
}
|
||||
|
||||
.text3 {
|
||||
float: right;
|
||||
margin-right: 24rpx;
|
||||
line-height: 19rpx;
|
||||
}
|
||||
|
||||
.text3>image {
|
||||
width: 21rpx;
|
||||
height: 21rpx;
|
||||
}
|
||||
|
||||
.text3>text {
|
||||
font-weight: Regular;
|
||||
width: 41rpx;
|
||||
height: 19rpx;
|
||||
font-size: 24rpx;
|
||||
text-align: left;
|
||||
color: #f99b46;
|
||||
padding: 1rpx;
|
||||
margin-left: 8rpx;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -1,104 +1,26 @@
|
|||
<!-- 兑换商城 -->
|
||||
<template class="content">
|
||||
|
||||
<navbar_neadVue title="兑换商城"></navbar_neadVue>
|
||||
|
||||
<navbar_nead title="兑换商城"></navbar_nead>
|
||||
<view class="view-top">
|
||||
<view class="view-top-rigth-text">
|
||||
<text>我的校园币:{{count}}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="cp">
|
||||
<view class="view-content" v-for="(item,index) in arr" :key="index">
|
||||
<view class="content-main">
|
||||
<view class="content-image">
|
||||
<image :src="item.src"></image>
|
||||
</view>
|
||||
<view class="content-text">
|
||||
<view class="text1">
|
||||
{{item.content}}
|
||||
</view>
|
||||
<view class="text-flex">
|
||||
|
||||
<view class="text2">
|
||||
兑换所需
|
||||
</view>
|
||||
|
||||
<view class="text3">
|
||||
<image src="../../static/images/sign/1.png"></image>
|
||||
<text>{{item.count}}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<ex></ex>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import navbar_nead from "@/pages/common/navbar/navbar_nead.vue";
|
||||
import ex from "@/pages/common/exchange/index.vue";
|
||||
import {
|
||||
ref,
|
||||
reactive
|
||||
} from "vue";
|
||||
|
||||
import navbar_neadVue from "../common/navbar/navbar_nead.vue";
|
||||
|
||||
const count = ref("750");
|
||||
|
||||
let arr = reactive([{
|
||||
id: 1,
|
||||
src: "https://cbu01.alicdn.com/img/ibank/2019/524/629/11890926425_297889188.jpg",
|
||||
content: "[端午礼盒] 西凤酒52度头曲礼盒 陕西凤香型白酒礼11111111111",
|
||||
count: 700
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
src: "https://cbu01.alicdn.com/img/ibank/2016/442/823/3216328244_1451018438.jpg",
|
||||
content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111 ",
|
||||
count: 200
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
src: "https://ts1.cn.mm.bing.net/th/id/R-C.2bcea282254788c581f0a18f47efb5f8?rik=rcZeIVRgTcWUkQ&riu=http%3a%2f%2fhimg2.huanqiu.com%2fattachment2010%2f2019%2f0429%2f10%2f58%2f20190429105829589.jpg&ehk=HCIAZrOId0EVKf%2bFyNg7cgff6Cg8WLUCNHpaDgwi1ng%3d&risl=&pid=ImgRaw&r=0",
|
||||
content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111 ",
|
||||
count: 500
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
src: "https://ts1.cn.mm.bing.net/th/id/R-C.2bcea282254788c581f0a18f47efb5f8?rik=rcZeIVRgTcWUkQ&riu=http%3a%2f%2fhimg2.huanqiu.com%2fattachment2010%2f2019%2f0429%2f10%2f58%2f20190429105829589.jpg&ehk=HCIAZrOId0EVKf%2bFyNg7cgff6Cg8WLUCNHpaDgwi1ng%3d&risl=&pid=ImgRaw&r=0",
|
||||
content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111 ",
|
||||
count: 500
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
src: "https://ts1.cn.mm.bing.net/th/id/R-C.2bcea282254788c581f0a18f47efb5f8?rik=rcZeIVRgTcWUkQ&riu=http%3a%2f%2fhimg2.huanqiu.com%2fattachment2010%2f2019%2f0429%2f10%2f58%2f20190429105829589.jpg&ehk=HCIAZrOId0EVKf%2bFyNg7cgff6Cg8WLUCNHpaDgwi1ng%3d&risl=&pid=ImgRaw&r=0",
|
||||
content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111 ",
|
||||
count: 500
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
src: "https://ts1.cn.mm.bing.net/th/id/R-C.2bcea282254788c581f0a18f47efb5f8?rik=rcZeIVRgTcWUkQ&riu=http%3a%2f%2fhimg2.huanqiu.com%2fattachment2010%2f2019%2f0429%2f10%2f58%2f20190429105829589.jpg&ehk=HCIAZrOId0EVKf%2bFyNg7cgff6Cg8WLUCNHpaDgwi1ng%3d&risl=&pid=ImgRaw&r=0",
|
||||
content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111 ",
|
||||
count: 500
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
src: "https://ts1.cn.mm.bing.net/th/id/R-C.2bcea282254788c581f0a18f47efb5f8?rik=rcZeIVRgTcWUkQ&riu=http%3a%2f%2fhimg2.huanqiu.com%2fattachment2010%2f2019%2f0429%2f10%2f58%2f20190429105829589.jpg&ehk=HCIAZrOId0EVKf%2bFyNg7cgff6Cg8WLUCNHpaDgwi1ng%3d&risl=&pid=ImgRaw&r=0",
|
||||
content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111 ",
|
||||
count: 500
|
||||
},
|
||||
]);
|
||||
|
||||
function return_left(){
|
||||
console.log("返回事件")
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.content {
|
||||
background: #faf9fa;
|
||||
}
|
||||
|
||||
.view-top {
|
||||
/* height: 100rpx; */
|
||||
}
|
||||
|
|
@ -117,98 +39,4 @@
|
|||
text-align: left;
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
|
||||
.cp {
|
||||
display: grid;
|
||||
grid-template-columns: auto auto;
|
||||
margin-left: 32rpx;
|
||||
margin-right: 32rpx;
|
||||
margin-top: 23rpx;
|
||||
grid-column-gap: 26rpx;
|
||||
grid-row-gap: 24rpx;
|
||||
}
|
||||
|
||||
.view-content {
|
||||
width: 330rpx;
|
||||
height: 482rpx;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.content-main {
|
||||
width: 330rpx;
|
||||
height: 482rpx;
|
||||
border-radius: 24rpx 24rpx 24rpx 24rpx;
|
||||
background: #ffffff;
|
||||
}
|
||||
|
||||
.content-image>image {
|
||||
width: 330rpx;
|
||||
height: 330rpx;
|
||||
border-radius: 24rpx 24rpx 0 0;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.content-text {
|
||||
margin-left: 24rpx;
|
||||
margin-top: 24rpx;
|
||||
}
|
||||
|
||||
.text1 {
|
||||
font-weight: Regular;
|
||||
width: 266rpx;
|
||||
height: 54rpx;
|
||||
line-height: 27rpx;
|
||||
font-size: 22rpx;
|
||||
text-align: left;
|
||||
color: #000000;
|
||||
|
||||
overflow: hidden;
|
||||
word-wrap: break-word;
|
||||
text-overflow: ellipsis;
|
||||
display: -webkit-box;
|
||||
-webkit-box-orient: vertical;
|
||||
-webkit-line-clamp: 2;
|
||||
|
||||
}
|
||||
|
||||
.text-flex {
|
||||
margin-top: 28rpx;
|
||||
width: 330rpx;
|
||||
height: 20rpx;
|
||||
}
|
||||
|
||||
.text2 {
|
||||
font-weight: Regular;
|
||||
width: 100rpx;
|
||||
height: 20rpx;
|
||||
font-size: 20rpx;
|
||||
text-align: left;
|
||||
color: #999999;
|
||||
line-height: 20rpx;
|
||||
align-items: center;
|
||||
float: left;
|
||||
}
|
||||
|
||||
.text3 {
|
||||
float: right;
|
||||
margin-right: 24rpx;
|
||||
line-height: 19rpx;
|
||||
}
|
||||
|
||||
.text3>image {
|
||||
width: 21rpx;
|
||||
height: 21rpx;
|
||||
}
|
||||
|
||||
.text3>text {
|
||||
font-weight: Regular;
|
||||
width: 41rpx;
|
||||
height: 19rpx;
|
||||
font-size: 24rpx;
|
||||
text-align: left;
|
||||
color: #f99b46;
|
||||
padding: 1rpx;
|
||||
margin-left: 8rpx;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -6,6 +6,32 @@
|
|||
<view>
|
||||
<image :src="images"></image>
|
||||
</view>
|
||||
|
||||
<view class="but" @click="butOn()">
|
||||
<text>立即兑换</text>
|
||||
</view>
|
||||
|
||||
<uni-popup ref="popup" border-radius="32rpx 32rpx 0 0" background-color="#ffffff">
|
||||
<view class="uni-popup-view">
|
||||
<view class="uni-top">
|
||||
<text class="uni-top-text">确认兑换</text>
|
||||
<view style="float: right;margin-right: 32rpx;vertical-align:middle;">
|
||||
<image style="width: 32rpx;height: 32rpx;" src="../../static/images/sign/关闭.png"></image>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
<view>
|
||||
<view>
|
||||
<text></text>
|
||||
<image src=""></image>
|
||||
<text></text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</uni-popup>
|
||||
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
|
|
@ -13,8 +39,12 @@
|
|||
ref
|
||||
}
|
||||
from "vue"
|
||||
const popup = ref(null);
|
||||
const images = ref("https://cbu01.alicdn.com/img/ibank/2018/374/990/9121099473_1558693147.jpg");
|
||||
|
||||
const images = ref("https://cbu01.alicdn.com/img/ibank/2016/442/823/3216328244_1451018438.jpg")
|
||||
function butOn() {
|
||||
popup.value.open('bottom');
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
|
|
@ -24,13 +54,74 @@
|
|||
top: 110rpx;
|
||||
left: 32rpx;
|
||||
}
|
||||
|
||||
.uninavbar>image {
|
||||
width: 31rpx;
|
||||
height: 44rpx;
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
view>image {
|
||||
width: 750rpx;
|
||||
height: 500rpx;
|
||||
}
|
||||
|
||||
.but {
|
||||
width: 686rpx;
|
||||
height: 88rpx;
|
||||
border-radius: 44rpx 44rpx 44rpx 44rpx;
|
||||
background: linear-gradient(-90deg, #c9f6f5, #f7f8e3);
|
||||
}
|
||||
|
||||
.but>text {
|
||||
font-weight: Regular;
|
||||
width: 131rpx;
|
||||
height: 33rpx;
|
||||
font-size: 32rpx;
|
||||
text-align: left;
|
||||
color: #000000;
|
||||
display: block;
|
||||
margin: auto;
|
||||
line-height: 88rpx;
|
||||
}
|
||||
|
||||
.bot-bot {
|
||||
width: 750rpx;
|
||||
height: 1000rpx;
|
||||
border-radius: 32rpx 32rpx 0 0;
|
||||
/* background: #ffffff; */
|
||||
background-color: #000000;
|
||||
position: absolute;
|
||||
bottom: 40rpx;
|
||||
left: 0rpx;
|
||||
transition: bottom 5s;
|
||||
/* Slide in effect */
|
||||
}
|
||||
|
||||
.buts {
|
||||
position: absolute;
|
||||
bottom: 91rpx;
|
||||
}
|
||||
|
||||
.uni-popup-view{
|
||||
position: relative;
|
||||
left: 0rpx;
|
||||
height: 70vh;
|
||||
width: 750rpx;
|
||||
margin-top: 31rpx;
|
||||
}
|
||||
.uni-top{
|
||||
display: flex;
|
||||
}
|
||||
.uni-top-text {
|
||||
font-weight: Regular;
|
||||
width: 124rpx;
|
||||
height: 31rpx;
|
||||
font-size: 30rpx;
|
||||
text-align: left;
|
||||
color: #000000;
|
||||
display: block;
|
||||
margin: auto;
|
||||
line-height: 31rpx;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -0,0 +1,178 @@
|
|||
<!-- 收货地址 -->
|
||||
<template>
|
||||
<navbar_neadVue title="收货地址" background_color="#ffffff"></navbar_neadVue>
|
||||
|
||||
<!-- 有地址 -->
|
||||
<view v-if="arr.length >= 1" v-for="(item,index) in arr" :key="index">
|
||||
<view class="haveaddress" @click="HaveAddress(item.id)">
|
||||
<text class="textname">
|
||||
{{item.name}}<text class="textphone">{{item.phone}}</text>
|
||||
</text>
|
||||
<image v-if="IsHave === item.id" class="image" src="../../static/images/sign/选中.png"></image>
|
||||
<image v-else class="image" src="../../static/images/sign/未选中.png"></image>
|
||||
|
||||
<text class="textaddress">{{item.address}}</text>
|
||||
</view>
|
||||
|
||||
<view class="butview">
|
||||
<view class="but">
|
||||
<text>确定地址</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
<!-- 添加收货地址 -->
|
||||
<view class="noadderes" v-else>
|
||||
<image class="icons" src="../../static/images/sign/暂无地址.png"></image>
|
||||
<text class="notext">暂无收货地址请添加</text>
|
||||
|
||||
<view class="butview">
|
||||
<view class="but">
|
||||
<text>添加地址</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {
|
||||
reactive,
|
||||
ref
|
||||
} from "vue";
|
||||
import navbar_neadVue from "@/pages/common/navbar/navbar_nead.vue";
|
||||
|
||||
const arr = reactive([{
|
||||
id: 1,
|
||||
name: "吴先生",
|
||||
phone: "19993439121",
|
||||
address: "天津 天津市 河北区 建昌道街道红星北路诗景颂院12号楼1单元120212号楼1单元120212号楼1单元1202天津 天津市 河北区 建昌道街道红星北路诗景颂院12号楼1单元1202",
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
name: "王先生",
|
||||
phone: "19993439121",
|
||||
address: "天津 天津市 河北区 建昌道街道红星北路诗景颂院12号楼1单元120212号楼1单元120212号楼1单元1202天津 天津市 河北区 建昌道街道红星北路诗景颂院12号楼1单元1202",
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
name: "李先生",
|
||||
phone: "19993439121",
|
||||
address: "天津 天津市 河北区 建昌道街道红星北路诗景颂院12号楼1单元120212号楼1单元120212号楼1单元1202天津 天津市 河北区 建昌道街道红星北路诗景颂院12号楼1单元1202",
|
||||
}
|
||||
])
|
||||
|
||||
const IsHave = ref(0)
|
||||
|
||||
console.log(arr.length)
|
||||
|
||||
function HaveAddress(id) {
|
||||
IsHave.value = id;
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
@import '@/pages/common/navbar/navbar.css';
|
||||
|
||||
.haveaddress {
|
||||
width: 686rpx;
|
||||
height: 156rpx;
|
||||
border-radius: 24rpx 24rpx 24rpx 24rpx;
|
||||
background: #ffffff;
|
||||
margin-left: 32rpx;
|
||||
margin-right: 32rpx;
|
||||
margin-top: 24rpx;
|
||||
}
|
||||
|
||||
.textname {
|
||||
font-weight: Regular;
|
||||
width: 72rpx;
|
||||
height: 24rpx;
|
||||
font-size: 24rpx;
|
||||
text-align: left;
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
.textphone {
|
||||
margin-left: 27rpx;
|
||||
}
|
||||
|
||||
.image {
|
||||
width: 32rpx;
|
||||
height: 32rpx;
|
||||
vertical-align: middle;
|
||||
float: right;
|
||||
margin-right: 24rpx;
|
||||
margin-top: 62rpx;
|
||||
}
|
||||
|
||||
.textaddress {
|
||||
color: #cbcbcb;
|
||||
font-weight: Regular;
|
||||
font-face: Microsoft YaHei;
|
||||
font-size: 24rpx;
|
||||
text-align: left;
|
||||
line-height: 36rpx;
|
||||
display: block;
|
||||
margin-right: 137rpx;
|
||||
margin-top: 27rpx;
|
||||
|
||||
overflow: hidden;
|
||||
word-wrap: break-word;
|
||||
text-overflow: ellipsis;
|
||||
display: -webkit-box;
|
||||
-webkit-box-orient: vertical;
|
||||
-webkit-line-clamp: 2;
|
||||
}
|
||||
|
||||
.icons {
|
||||
position: absolute;
|
||||
width: 256rpx;
|
||||
height: 232rpx;
|
||||
left: 247rpx;
|
||||
top: 219rpx;
|
||||
}
|
||||
|
||||
.notext {
|
||||
font-weight: Regular;
|
||||
width: 276rpx;
|
||||
height: 32rpx;
|
||||
font-size: 30rpx;
|
||||
text-align: left;
|
||||
color: #00CCBE;
|
||||
position: absolute;
|
||||
left: 232rpx;
|
||||
top: 480rpx;
|
||||
}
|
||||
|
||||
.butview {
|
||||
width: 750rpx;
|
||||
height: 136rpx;
|
||||
background: #ffffff;
|
||||
position: absolute;
|
||||
bottom: 68rpx;
|
||||
}
|
||||
|
||||
.but {
|
||||
width: 686rpx;
|
||||
height: 88rpx;
|
||||
border-radius: 44rpx 44rpx 44rpx 44rpx;
|
||||
background: #c0f0ec;
|
||||
margin-left: 32rpx;
|
||||
}
|
||||
|
||||
.but>text {
|
||||
font-weight: Regular;
|
||||
width: 123rpx;
|
||||
height: 30rpx;
|
||||
font-size: 30rpx;
|
||||
text-align: left;
|
||||
color: #00CCBE;
|
||||
display: block;
|
||||
margin: auto;
|
||||
line-height: 88rpx;
|
||||
margin-top: 22rpx;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -50,69 +50,6 @@ text-align: center;
|
|||
color: #7E7E7E;">12日</text>
|
||||
</li>
|
||||
|
||||
<li style="margin-left: 58rpx;">
|
||||
<image style="width: 42rpx; height: 44rpx;" src="../../static/images/sign/1.png">
|
||||
</image>
|
||||
|
||||
<text style="display: block; font-weight: Regular;
|
||||
width: 60rpx;
|
||||
height: 22rpx;
|
||||
font-size: 24rpx;
|
||||
text-align: left;
|
||||
padding-right: 4rpx;
|
||||
color: #7E7E7E;">12日</text>
|
||||
</li>
|
||||
|
||||
<li style="margin-left: 58rpx;">
|
||||
<image style="width: 42rpx; height: 44rpx;" src="../../static/images/sign/1.png">
|
||||
</image>
|
||||
|
||||
<text style="display: block; font-weight: Regular;
|
||||
width: 60rpx;
|
||||
height: 22rpx;
|
||||
font-size: 24rpx;
|
||||
text-align: left;
|
||||
padding-right: 4rpx;
|
||||
color: #7E7E7E;">12日</text>
|
||||
</li>
|
||||
|
||||
<li style="margin-left: 58rpx;">
|
||||
<image style="width: 42rpx; height: 44rpx;" src="../../static/images/sign/1.png">
|
||||
</image>
|
||||
|
||||
<text style="display: block; font-weight: Regular;
|
||||
width: 60rpx;
|
||||
height: 22rpx;
|
||||
font-size: 24rpx;
|
||||
text-align: left;
|
||||
padding-right: 4rpx;
|
||||
color: #7E7E7E;">12日</text>
|
||||
</li>
|
||||
|
||||
<li style="margin-left: 58rpx;">
|
||||
<image style="width: 42rpx; height: 44rpx;" src="../../static/images/sign/1.png">
|
||||
</image>
|
||||
|
||||
<text style="display: block; font-weight: Regular;
|
||||
width: 60rpx;
|
||||
height: 22rpx;
|
||||
font-size: 24rpx;
|
||||
text-align: left;
|
||||
padding-right: 4rpx;
|
||||
color: #7E7E7E;">12日</text>
|
||||
</li>
|
||||
<li style="margin-left: 58rpx;">
|
||||
<image style="width: 42rpx; height: 44rpx;" src="../../static/images/sign/1.png">
|
||||
</image>
|
||||
|
||||
<text style="display: block; font-weight: Regular;
|
||||
width: 60rpx;
|
||||
height: 22rpx;
|
||||
font-size: 24rpx;
|
||||
text-align: left;
|
||||
padding-right: 4rpx;
|
||||
color: #7E7E7E;">12日</text>
|
||||
</li>
|
||||
</ul>
|
||||
</view>
|
||||
|
||||
|
|
@ -145,26 +82,40 @@ color: #7E7E7E;">12日</text>
|
|||
</view>
|
||||
|
||||
<view style="height: 24rpx;"></view>
|
||||
</view>
|
||||
|
||||
|
||||
<view class="bottom">
|
||||
<view class="bottom-left"></view>
|
||||
<view class="bottom-text">
|
||||
<text class="bottom-text-s">兑换商城</text>
|
||||
<text class="bottom-text-r" @click="GoExchange()">更多 <text>></text></text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
<view>
|
||||
|
||||
<ex></ex>
|
||||
</view>
|
||||
|
||||
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import navbar_neadVue from "../common/navbar/navbar_nead.vue";
|
||||
import exchangemall from "./exchangemall.vue"
|
||||
|
||||
import navbar_neadVue from "@/pages/common/navbar/navbar_nead.vue";
|
||||
import ex from "@/pages/common/exchange/index.vue";
|
||||
//
|
||||
function GoTo() {
|
||||
|
||||
uni.navigateTo({
|
||||
url: './signiddetails'
|
||||
});
|
||||
}
|
||||
|
||||
//
|
||||
function GoExchange(){
|
||||
uni.navigateTo({
|
||||
url: './exchangemall'
|
||||
});
|
||||
}
|
||||
import {
|
||||
ref,
|
||||
reactive
|
||||
|
|
@ -448,4 +399,45 @@ color: #7E7E7E;">12日</text>
|
|||
font-size: 20rpx;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.bottom {
|
||||
margin-right: 32rpx;
|
||||
margin-left: 32rpx;
|
||||
margin-top: 24rpx;
|
||||
}
|
||||
|
||||
.bottom-left {
|
||||
width: 4rpx;
|
||||
height: 30rpx;
|
||||
border-radius: 2rpx 2rpx 2rpx 2rpx;
|
||||
background: #f99b46;
|
||||
float: left;
|
||||
margin-top: 8rpx;
|
||||
}
|
||||
|
||||
.bottom-text-s {
|
||||
font-weight: Regular;
|
||||
/* width: 123rpx; */
|
||||
height: 31rpx;
|
||||
font-size: 30rpx;
|
||||
text-align: left;
|
||||
color: #000000;
|
||||
margin-left: 24rpx;
|
||||
vertical-align: baseline;
|
||||
}
|
||||
|
||||
.bottom-text-r {
|
||||
float: right;
|
||||
font-weight: Regular;
|
||||
/* width: 47rpx; */
|
||||
height: 24rpx;
|
||||
line-height: 48rpx;
|
||||
font-size: 24rpx;
|
||||
text-align: left;
|
||||
color: #999999;
|
||||
vertical-align: baseline;
|
||||
|
||||
}
|
||||
|
||||
.bottom-text-r>text {}
|
||||
</style>
|
||||
|
|
@ -1,8 +1,7 @@
|
|||
<!-- 签到明细 -->
|
||||
<template>
|
||||
<view class="uninavbar">
|
||||
<uni-nav-bar statusBar="false" :border="false" left-icon="leftIcon" title="签到明细" />
|
||||
</view>
|
||||
<navbar_neadVue title="签到明细"></navbar_neadVue>
|
||||
<view style="background-color: #ffffff;">
|
||||
<view style="height: 24rpx;"></view>
|
||||
<view class="content" v-for="(item,index) in arr" :key="index">
|
||||
<view class="uni-list">
|
||||
|
|
@ -13,6 +12,7 @@
|
|||
<view class="uni-list--border-bottom"></view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</template>
|
||||
|
||||
|
|
@ -22,6 +22,7 @@
|
|||
ref
|
||||
} from "vue"
|
||||
let leftIcon = ref("../../static/images/sign/return.png")
|
||||
import navbar_neadVue from "../common/navbar/navbar_nead.vue";
|
||||
let arr = reactive([{
|
||||
id: 1,
|
||||
text: "每日签到",
|
||||
|
|
@ -82,11 +83,9 @@
|
|||
line-height: 44rpx;
|
||||
}
|
||||
|
||||
*{
|
||||
background-color: #ffffff;;
|
||||
}
|
||||
|
||||
.content {
|
||||
background-color: #ffffff;
|
||||
margin-left: 32rpx;
|
||||
margin-right: 32rpx;
|
||||
margin-top: 24rpx;
|
||||
|
|
@ -110,7 +109,7 @@
|
|||
|
||||
.uni-list-bottom-text {
|
||||
font-weight: 400;
|
||||
width: 201rpx;
|
||||
/* width: 201rpx; */
|
||||
height: 19rpx;
|
||||
font-size: 24rpx;
|
||||
text-align: left;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,109 @@
|
|||
<!-- 兑换成功 -->
|
||||
<template>
|
||||
<view class="content">
|
||||
<view class="uninavbar">
|
||||
<image :src="returns"></image>
|
||||
</view>
|
||||
<view class="backimage">
|
||||
<image :src="images"></image>
|
||||
</view>
|
||||
|
||||
<image :src="icons" class="icon"></image>
|
||||
|
||||
<view class="con-text">
|
||||
<text>兑换成功</text>
|
||||
</view>
|
||||
|
||||
<view class="but" @click="RetExChangemall()">
|
||||
<text>返回商城</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {
|
||||
ref
|
||||
} from 'vue';
|
||||
const returns = ref("../../static/images/sign/return.png");
|
||||
const images = ref("../../static/images/sign/兑换成功.png");
|
||||
const icons = ref("../../static/images/sign/成功.png");
|
||||
|
||||
function RetExChangemall(){
|
||||
uni.navigateTo({
|
||||
url: './exchangemall',
|
||||
// url: './exdetail',
|
||||
});
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.uninavbar {
|
||||
position: absolute;
|
||||
z-index: 9999;
|
||||
top: 110rpx;
|
||||
left: 32rpx;
|
||||
}
|
||||
|
||||
.uninavbar>image {
|
||||
width: 31rpx;
|
||||
height: 44rpx;
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
.backimage>image {
|
||||
width: 7270rpx;
|
||||
height: 599rpx;
|
||||
}
|
||||
|
||||
.content {
|
||||
width: 750rpx;
|
||||
height: 100vh;
|
||||
background: linear-gradient(-140deg, #83c4ff, #ffffff);
|
||||
}
|
||||
|
||||
.icon {
|
||||
width: 317rpx;
|
||||
height: 198rpx;
|
||||
position: absolute;
|
||||
top: 264rpx;
|
||||
left: 217rpx;
|
||||
}
|
||||
|
||||
.con-text>text {
|
||||
font-weight: Regular;
|
||||
width: 194rpx;
|
||||
height: 49rpx;
|
||||
font-size: 48rpx;
|
||||
text-align: left;
|
||||
color: #348FE2;
|
||||
display: block;
|
||||
margin: auto;
|
||||
position: absolute;
|
||||
top: 470rpx;
|
||||
left: 277rpx;
|
||||
}
|
||||
|
||||
.but {
|
||||
width: 686rpx;
|
||||
height: 88rpx;
|
||||
border-radius: 44rpx 44rpx 44rpx 44rpx;
|
||||
opacity: 0.24;
|
||||
background: #83c4ff;
|
||||
position: absolute;
|
||||
top: 590rpx;
|
||||
left: 32rpx;
|
||||
}
|
||||
|
||||
.but>text {
|
||||
font-weight: Regular;
|
||||
width: 124rpx;
|
||||
height: 31rpx;
|
||||
font-size: 30rpx;
|
||||
text-align: left;
|
||||
color: #348FE2;
|
||||
display: block;
|
||||
margin: auto;
|
||||
line-height: 88rpx;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -17,26 +17,27 @@ function checkWhite(url) {
|
|||
}
|
||||
|
||||
// 页面跳转验证拦截器
|
||||
let list = ["navigateTo", "redirectTo", "reLaunch", "switchTab"];
|
||||
// list.forEach((item) => {
|
||||
// let list = ["navigateTo", "redirectTo", "reLaunch", "switchTab"]
|
||||
// list.forEach(item => {
|
||||
// uni.addInterceptor(item, {
|
||||
// invoke(to) {
|
||||
|
||||
// if (getToken()) {
|
||||
// if (to.url === loginPage) {
|
||||
// console.log("to:",to);
|
||||
// uni.reLaunch({ url: "/" });
|
||||
// uni.reLaunch({ url: "/" })
|
||||
// }
|
||||
// return true;
|
||||
// return true
|
||||
// } else {
|
||||
// if (checkWhite(to.url)) {
|
||||
// return true;
|
||||
// return true
|
||||
// }
|
||||
// uni.reLaunch({ url: loginPage });
|
||||
// return false;
|
||||
// uni.reLaunch({ url: loginPage })
|
||||
// return false
|
||||
// }
|
||||
// },
|
||||
// fail(err) {
|
||||
// console.log("错误信息：", err);
|
||||
// },
|
||||
// });
|
||||
// });
|
||||
// console.log("错误信息：",err)
|
||||
// }
|
||||
// })
|
||||
// })
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 84 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 700 B |
Binary file not shown.
|
After Width: | Height: | Size: 578 B |
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 24 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
Loading…
Reference in New Issue