Skip to content

U
user
Commit 58ec7a26 by songbingqi
Options

完成隐私协议开发

parent d8ec07d8
Showing with 203 additions and 25 deletions
components/OrderQrCode/index.vue
...@@ -14,7 +14,21 @@ ...@@ -14,7 +14,21 @@
</div> </div>
<!-- <view class="status_text" v-if="showMask">——制作完成后才能扫哦——</view> --> <!-- <view class="status_text" v-if="showMask">——制作完成后才能扫哦——</view> -->
<div class="flow_describe"> <div class="flow_describe">
<view class="titleBox">
<view class="qrcodeTitle">
<view class="title">扫码流程</view> <view class="title">扫码流程</view>
<view class="icon">
<u-icon name="question-circle" color="#999999" :size="getPx(34)"></u-icon>
</view>
</view>
<view class="right" @click="goShow()">
<view class="Text">
<view>查看实景演示</view>
<image class="arrow" :style="{'height':'18rpx','width':'10rpx'}" :src="'../../static/imgs/jiantouhei.png'" />
</view>
</view>
</view>
<image :mode="'aspectFit'" class="flow_img" :src="'/static/imgs/saomaliucheng.png'"></image> <image :mode="'aspectFit'" class="flow_img" :src="'/static/imgs/saomaliucheng.png'"></image>
</div> </div>
...@@ -89,6 +103,14 @@ export default { ...@@ -89,6 +103,14 @@ export default {
}, },
methods: { methods: {
goShow() {
uni.navigateTo({url:'/orderSubPackage/pages/showhow/index'})
},
getPx(rpx) {
// console.log((rpx * (wx.getSystemInfoSync().windowWidth / 750)));
// console.log(wx.getSystemInfoSync().windowWidth);
return rpx * (wx.getSystemInfoSync().windowWidth / 750);
},
start(e) { start(e) {
this.clientYStart = e.changedTouches[0].clientY this.clientYStart = e.changedTouches[0].clientY
}, },
...@@ -243,18 +265,64 @@ export default { ...@@ -243,18 +265,64 @@ export default {
} }
} }
.flow_describe { .flow_describe {
width: 100%; width: 100%;
height: 300rpx; height: 300rpx;
padding-left: 31rpx; padding-left: 31rpx;
.titleBox {
display: flex;
align-items: flex-end;
.qrcodeTitle {
display: flex;
justify-content: flex-start;
align-items: center;
.title { .title {
height: 40rpx;
line-height: 40rpx;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Semibold, PingFang SC; font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 600; font-weight: 600;
color: #000000; color: #000000;
} }
.icon {
margin-left: 16rpx;
}
}
.title {
font-size: 28rpx;
font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 600;
color: #000000;
}
.right {
display: flex;
margin-left: 8rpx;
.Text {
font-size: 20rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #999999;
display: flex;
align-items: center;
}
.arrow {
margin-left: 8rpx;
}
}
}
.flow_img { .flow_img {
padding:18rpx 32rpx 0rpx 32.83rpx; padding:18rpx 32rpx 0rpx 32.83rpx;
width: 590rpx; width: 590rpx;
...@@ -263,6 +331,8 @@ export default { ...@@ -263,6 +331,8 @@ export default {
} }
} }
} }
.flow_describe_tips{ .flow_describe_tips{
margin-top: 100rpx; margin-top: 100rpx;
......
mineSubPackage/pages/coupon/index.vue
<template> <template>
<view class="bigBox"> <view class="bigBox">
<!-- <u-tabs
:list="list1"
:scrollable="false"
lineColor="#0050F6"
lineWidth="32"
lineHeight="2"
:activeStyle="{
fontSize: '24rpx',
fontFamily: 'PingFangSC-Medium, PingFang SC',
color: '#333333',
fontWeight: '500',
paddingBottom: '12rpx',
}"
:inactiveStyle="{
fontSize: '24rpx',
fontFamily: 'PingFangSC-Medium, PingFang SC',
color: '#666666',
fontWeight: '400',
paddingBottom: '12rpx',
}"
itemStyle="height: 64rpx"
@click="changeTab"
></u-tabs> -->
<Tabs :list='list1' @changeTab="changeTab" :newIndex="current" /> <Tabs :list='list1' @changeTab="changeTab" :newIndex="current" />
<view> <view>
<swiper :current="current" class="swiper" @change="swiperChange"> <swiper :current="current" class="swiper" @change="swiperChange">
......
orderSubPackage/pages/orderInfo/index.vue
...@@ -31,7 +31,20 @@ ...@@ -31,7 +31,20 @@
<!-- <view class="scan_tips" v-if="qrTextShow">——制作完成后才能扫哦——</view> --> <!-- <view class="scan_tips" v-if="qrTextShow">——制作完成后才能扫哦——</view> -->
<canvas v-if="qrShow" class="canvas-code" canvas-id="myQrcode" style="background:#fff;width: 200px;height: 200px; display:block; left:-800rpx;position:absolute;" /> <canvas v-if="qrShow" class="canvas-code" canvas-id="myQrcode" style="background:#fff;width: 200px;height: 200px; display:block; left:-800rpx;position:absolute;" />
<div v-if="qrShow" class="flow_describe"> <div v-if="qrShow" class="flow_describe">
<view class="titleBox">
<view class="qrcodeTitle">
<view class="title">扫码流程</view> <view class="title">扫码流程</view>
<view class="icon">
<u-icon name="question-circle" color="#999999" :size="getPx(34)"></u-icon>
</view>
</view>
<view class="right" @click="goShow()">
<view class="Text">
<view>查看实景演示</view>
<image class="arrow" :style="{'height':'18rpx','width':'10rpx'}" :src="'../../../static/imgs/jiantouhei.png'" />
</view>
</view>
</view>
<image :mode="'aspectFit'" class="flow_img" src="/static/imgs/saomaliucheng.png" /> <image :mode="'aspectFit'" class="flow_img" src="/static/imgs/saomaliucheng.png" />
</div> </div>
</div> </div>
...@@ -132,6 +145,9 @@ export default { ...@@ -132,6 +145,9 @@ export default {
} }
}, },
methods: { methods: {
goShow() {
uni.navigateTo({url:'/orderSubPackage/pages/showhow/index'})
},
refundInfo() { refundInfo() {
const { id } = this.orderInfo const { id } = this.orderInfo
uni.setStorageSync('orderId', id); uni.setStorageSync('orderId', id);
...@@ -526,6 +542,15 @@ export default { ...@@ -526,6 +542,15 @@ export default {
padding-right: 32rpx; padding-right: 32rpx;
padding-bottom: 60rpx; padding-bottom: 60rpx;
.titleBox {
display: flex;
align-items: flex-end;
.qrcodeTitle {
display: flex;
justify-content: flex-start;
align-items: center;
.title { .title {
height: 40rpx; height: 40rpx;
line-height: 40rpx; line-height: 40rpx;
...@@ -535,6 +560,40 @@ export default { ...@@ -535,6 +560,40 @@ export default {
color: #000000; color: #000000;
} }
.icon {
margin-left: 8rpx;
}
}
.title {
font-size: 28rpx;
font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 600;
color: #000000;
}
.right {
display: flex;
margin-left: 8rpx;
.Text {
font-size: 20rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #999999;
display: flex;
align-items: center;
}
.arrow {
margin-left: 8rpx;
}
}
}
.flow_img { .flow_img {
padding: 18rpx 0rpx 0rpx 32rpx; padding: 18rpx 0rpx 0rpx 32rpx;
width: 592rpx; width: 592rpx;
......
orderSubPackage/pages/showhow/index.vue 0 → 100644
<template>
<view class="bigBox">
<Tabs :list='list1' @changeTab="changeTab" :newIndex="current" />
<view>
<swiper :current="current" class="swiper" @change="swiperChange">
<swiper-item>
<view class="list">
图片演示
</view>
</swiper-item>
<swiper-item>
<view class="list">
视频演示
</view>
</swiper-item>
</swiper>
</view>
</view>
</template>
<script>
import Ticket from '@/components/Ticket/index.vue'
import Tabs from '@/components/Tabs/index.vue'
export default {
components: {Ticket,Tabs},
data() {
return {
list1: [
{
name: "图片演示",
},
{
name: "视频演示",
},
],
nouserList:[],
current: 0,
actionIndx:0
};
},
mounted(){
},
methods: {
changeTab(current) {
this.current = current;
},
swiperChange(val){
this.current = val.detail.current;
}
},
};
</script>
<style lang="scss" scoped>
.bigBox {
.swiper {
background: #F8F8F8;
height: calc(100vh - 64rpx);
.list{
height: 100%;
padding: 0rpx 32rpx;
overflow-y: scroll;
}
}
}
</style>
pages.json
...@@ -87,6 +87,13 @@ ...@@ -87,6 +87,13 @@
"navigationStyle": "custom", "navigationStyle": "custom",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},
{
"path": "pages/showhow/index",
"style": {
"navigationBarTitleText": "实景演示",
"enablePullDownRefresh": false
}
} }
] ]
}, },
......
pages/menu/menu.vue
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
style="background:#fff;width: 200px;height: 200px; display:block; left:-800rpx;position:absolute;" /> style="background:#fff;width: 200px;height: 200px; display:block; left:-800rpx;position:absolute;" />
<show-toast ref="toast"/> <show-toast ref="toast"/>
<taBar select="0"></taBar> <taBar select="0"></taBar>
<ShopCar ref="shopbar" :shopState="shopInfo.state"> <ShopCar ref="shopbar" :shopState="shopInfo.state" />
</view> </view>
</template> </template>
<script> <script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment