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

提交

Browse Source
dev
游梦婷 2 years ago
parent a7838a7169 08c557c6e9
commit 8cc34055c6
7 changed files with 1544 additions and 1491 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. 36
      App.vue
  2. 2
      index.html
  3. 820
      pages/tabBar/category/category.vue
  4. 2030
      pages/tabBar/home/home.vue
  5. 2
      pages/user/coupon/coupon.vue
  6. 145
      pages/user/order_list/order_list.vue
  7. BIN
      static/img/bgimg.jpg

36
App.vue
Unescape View File

@ -99,25 +99,25 @@
// #endif // #endif
// #ifdef H5 // #ifdef H5
let that = this; let that = this;
that.globalData.url = 'https://hsgcs.dctpay.com/crest'; // that.globalData.url = 'https://hsgcs.dctpay.com/crest';
that.globalData.v1url = 'https://hsgcs.dctpay.com/v1'; // that.globalData.v1url = 'https://hsgcs.dctpay.com/v1';
that.globalData.payurl = 'https://gratia-pay.dctpay.com/crest'; // that.globalData.payurl = 'https://gratia-pay.dctpay.com/crest';
that.globalData.orderurl = 'https://hsgcs.dctpay.com/order'; // that.globalData.orderurl = 'https://hsgcs.dctpay.com/order';
that.globalData.userurl = 'https://hsgcs.dctpay.com/user'; // that.globalData.userurl = 'https://hsgcs.dctpay.com/user';
that.globalData.brestUrl = 'https://hsgcs.dctpay.com/brest'; // that.globalData.brestUrl = 'https://hsgcs.dctpay.com/brest';
that.globalData.imgUrl = 'https://hsgcs.dctpay.com/filesystem/'; // that.globalData.imgUrl = 'https://hsgcs.dctpay.com/filesystem/';
that.globalData.imageWxImg = 'https://hsgcs.dctpay.com/filesystem/wxApplets/'; // that.globalData.imageWxImg = 'https://hsgcs.dctpay.com/filesystem/wxApplets/';
that.globalData.imageqrImg = 'https://hsgcs.dctpay.com/filesystem/temporary/'; // that.globalData.imageqrImg = 'https://hsgcs.dctpay.com/filesystem/temporary/';
// that.globalData.url = 'https://hsg.dctpay.com/crest'; that.globalData.url = 'https://hsg.dctpay.com/crest';
// that.globalData.v1url = 'https://hsg.dctpay.com/v1'; that.globalData.v1url = 'https://hsg.dctpay.com/v1';
// that.globalData.payurl = 'https://pay.dctpay.com/crest'; that.globalData.payurl = 'https://pay.dctpay.com/crest';
// that.globalData.orderurl = 'https://hsg.dctpay.com/order'; that.globalData.orderurl = 'https://hsg.dctpay.com/order';
// that.globalData.userurl = 'https://hsg.dctpay.com/user'; that.globalData.userurl = 'https://hsg.dctpay.com/user';
// that.globalData.brestUrl = 'https://hsg.dctpay.com/brest'; that.globalData.brestUrl = 'https://hsg.dctpay.com/brest';
// that.globalData.imgUrl = 'https://hsg.dctpay.com/filesystem/'; that.globalData.imgUrl = 'https://hsg.dctpay.com/filesystem/';
// that.globalData.imageWxImg = 'https://hsg.dctpay.com/filesystem/wxApplets/'; that.globalData.imageWxImg = 'https://hsg.dctpay.com/filesystem/wxApplets/';
// that.globalData.imageqrImg = 'https://hsg.dctpay.com/filesystem/temporary/'; that.globalData.imageqrImg = 'https://hsg.dctpay.com/filesystem/temporary/';
uni.getStorage({ uni.getStorage({
key: 'openId', key: 'openId',
success(e) { success(e) {

2
index.html
Unescape View File

@ -18,7 +18,7 @@
<script src="https://unpkg.com/video.js/dist/video.min.js"></script> <script src="https://unpkg.com/video.js/dist/video.min.js"></script>
<script src="https://cdn.bootcss.com/socket.io/2.1.1/socket.io.js"></script> <script src="https://cdn.bootcss.com/socket.io/2.1.1/socket.io.js"></script>
<script src="https://open.95516.com/s/open/js/upsdk.js"></script> <script src="https://open.95516.com/s/open/js/upsdk.js"></script>
<script src="https://3gimg.qq.com/lightmap/components/geolocation/geolocation.min.js"></script> <!-- <script src="https://3gimg.qq.com/lightmap/components/geolocation/geolocation.min.js"></script> -->
</head> </head>
<body> <body>
<noscript> <noscript>

820
pages/tabBar/category/category.vue
Unescape View File

@ -1,142 +1,279 @@
<template> <template>
<view> <view class="map-container">
<!-- 状态栏 --> <map style="width: 100%; height: 10vh;" :style="{height:mapheight}" :show-location='true' :latitude="latitude"
<view class="status" :style="{position:headerPosition}"></view> :longitude="longitude" :markers="marker" :scale="scale" @markertap="markertap" @callouttap='callouttap'>
<view class="header" :style="{position:headerPosition}"> <!-- <cover-view class="cover-view-loca" :style='{bottom:coverbottom}' @click="onControltap">
<view class="addr" @click="goPostion"> <cover-image class="cover-image" @click="play" src="../../../static/img/adresw.png"></cover-image>
<!-- <view class="icon location"></view> --> <cover-view>
{{city}} 定位
<image mode="widthFix" style="width: 15px;" :src="imagewxUrl+imgadres"></image> </cover-view>
</cover-view> -->
<!-- 一级分类 -->
<view class="width100 cover-views mart15">
<scroll-view class="width90 cover-view-cont" scroll-x="true">
<view class="cover-view-head font14" :class="[typeid == item.id ? 'onclick' : '']"
v-for="(item,index) in marker" :key="index" @click="changeType(item)">全部全部{{index}}</view>
</scroll-view>
<!-- 二级分类 -->
<view class="width100 mart15 backcorfff cover-viewchage alijus fotct" style="border-radius: 22px;">
<view class="font14 width30w" :class="[selectFirst == 1? 'onchange' : '']"
@click="changeChilerType()">全部
<image mode="widthFix" class="margle" style="width: 8px;" :src="imagewxUrl+imgadres2"></image>
</view>
<view class="font14 width30w" :class="[selectFirst == 1? 'onchange' : '']">全部
<image mode="widthFix" class="margle" style="width: 8px;" :src="imagewxUrl+imgadres2"></image>
</view>
<view class="font14 width30w">
<!-- 全部
<image mode="widthFix" class="margle" style="width: 8px;" :src="imagewxUrl+imgadres2"></image> -->
</view>
</view>
</view> </view>
<view class="input-box"> <!-- //模态框 -->
<input placeholder="搜索门店" placeholder-style="color:#c0c0c0;" @tap="toSearch()" /> <view class="change-cont" v-if="selectChiler == 1">
<view class="icon search"></view> <view class="width100 backcorfff"></view>
</view> </view>
</view> <!-- //显示内容 -->
<!-- 占位 --> <view class="change-optiac paddbotm20" v-if="selectChiler == 1">
<view class="place"></view> <scroll-view scroll-y="true" class="width100 height260">
<!-- <view class="category-list"> --> <view class="width90 bor-botm1 paddtop15 paddbotm15 alijusstart">
<view class="width100 height45l backcorfff" v-if="MerchantList != ''"> <view class="width90w" :class="[selectFirst == 1? 'onchange' : '']">发生地方是发生地方</view>
<view class="width90"> <image class="icon12" src="../../../static/img/jt.png" mode="widthFix"></image>
<!-- <view class="stuMenu flleft fotct" @click="showPopup() ">{{showCategoryIndex}}
<image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
</view> -->
<picker mode="selector" :range="MerchantList" range-key="merchantName" @change="showCategory">
<view class="font14">{{showCategoryIndex}}
<image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
</view> </view>
</picker> <view class="width90 bor-botm1 paddtop15 paddbotm15 alijusstart">
</view> <view class="width90w">发生地方是发生地方</view>
</view> <image class="icon12" src="../../../static/img/jt.png" mode="widthFix"></image>
</view>
<view v-if="categoryList == '' " class="mart60 fotct font14 fcor666 fotct width100"> <view class="width90 bor-botm1 paddtop15 paddbotm15 alijusstart">
<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres3"></image> <view class="width90w">发生地方是发生地方</view>
</view> <image class="icon12" src="../../../static/img/jt.png" mode="widthFix"></image>
<view class="width96 height100p backcorfff border-r mart10" v-for="(box,i) in categoryList" :key="i">
<image mode="widthFix" :src="imageUrl+box.ext1" class="recontleft flleft mart10 border-r"
style="max-height: 80px;" @click="toCategory(box)">
</image>
<view class="recontright">
<view class="text2 width100 font18 fontwig6 paddtop15" @click="toCategory(box)">
{{box.storeName}}
</view>
<view class="width100 mart10 height22">
<view class="width70 flleft text1 font13 fcor999" @click="toCategory(box)">
{{box.address}}
</view> </view>
<view class="width30 flright font13 fcor666 fotct" @click="seeloaction(item)"> <view class="width90 bor-botm1 paddtop15 paddbotm15 alijusstart">
<image mode="widthFix" :src="imagewxUrl+imgadres4" style="width: 10px;"></image> <view class="width90w">发生地方是发生地方</view>
{{box.distance}}km <image class="icon12" src="../../../static/img/jt.png" mode="widthFix"></image>
</view> </view>
<view class="width90 bor-botm1 paddtop15 paddbotm15 alijusstart">
<view class="width90w">发生地方是发生地方</view>
<image class="icon12" src="../../../static/img/jt.png" mode="widthFix"></image>
</view>
<view class="width90 bor-botm1 paddtop15 paddbotm15 alijusstart">
<view class="width90w">发生地方是发生地方</view>
<image class="icon12" src="../../../static/img/jt.png" mode="widthFix"></image>
</view>
<view class="width90 bor-botm1 paddtop15 paddbotm15 alijusstart">
<view class="width90w">发生地方是发生地方</view>
<image class="icon12" src="../../../static/img/jt.png" mode="widthFix"></image>
</view>
</scroll-view>
</view>
<!-- 未打开筛选前 -->
<view class="cover-view-foot" @click="updateSelected(2)" v-if="isSelected == 1">
<view class="line-view"></view>
<view class="mart10 fcor666 font13 width100">发现更多商户</view>
<view class="input-box">
<input placeholder="搜索商品" v-model="couponName" placeholder-style="color:#c0c0c0;"
@input="toSearch()" />
</view> </view>
</view> </view>
</view>
<!-- <wybPopup ref="popup" type="top" height="800" width="500" radius="6" :showCloseIcon="false"> <!-- 打开筛选后 -->
<view class="fotct font18 fontwig6 fcor333 mart10 height30">筛选门店</view> <view class="cover-view-foot-behind" @click="updateSelected(1)" v-if="isSelected == 2">
<view class="mart15"> <view class="line-view"></view>
<view :class="item.merchantName == showCategoryIndex?'activeRefuel':'refuel'" <view class="mart10 fcor666 font13 width100">发现更多商户</view>
v-for="(item,index) in MerchantList" :key="index" @click="showCategory(item.merchantName,item.id)"> <view class="input-box">
{{item.merchantName}} <input placeholder="搜索商品" v-model="couponName" placeholder-style="color:#c0c0c0;"
@input="toSearch()" />
</view> </view>
<scroll-view class="scoroll-cont width94 mart10" scroll-y="true">
<view class="width94 alijusstart" @click.stop="updateSelected(1)">
<view class="width30">
<image src="../../../static/img/jfx.png" class="icon45" mode="widthFix">
</image>
</view>
<view class="width70"></view>
</view>
</scroll-view>
</view> </view>
</wybPopup> -->
<!-- #ifdef MP--> </map>
<button open-type="contact">
<image :src="imagewxUrl+imgadres5" mode="widthFix" class="xfimg"></image>
</button>
<!-- #endif -->
<!-- #ifdef H5-->
<image :src="imagewxUrl+imgadres5" mode="widthFix" class="h5xfimg" @click="playPhone"></image>
<!-- #endif -->
</view> </view>
</template> </template>
<script> <script>
import {
getCouponList,
getStoreListByMerchant,
getMerchantList,
findByLatAndLng
} from "../../../Utils/Api.js";
import wybPopup from '../../../components/wyb-popup/wyb-popup.vue';
let app = getApp(); let app = getApp();
export default { export default {
components: {
wybPopup
},
data() { data() {
return { return {
showCategoryIndex: '', latitude: 23.106574, //纬度
showCategoryIndexId: '', longitude: 113.324587, //经度
headerPosition: "fixed", scale: 13, //缩放级别
bottomData: false,
imagewxUrl: app.globalData.imageWxImg, imagewxUrl: app.globalData.imageWxImg,
imgadres: 'jt.png',
imgadres2: 'xiala.png', imgadres2: 'xiala.png',
imgadres1: 'noorder.png', marker: [{
imgadres4: 'dh.png', id: 0,
imgadres3: 'noorder.png', latitude: 23.13065, //纬度
imgadres5: 'cusservice.png', longitude: 113.3274, //经度
city: "", iconPath: '../../../static/img/user/user5.png', //显示的图标
imageUrl: app.globalData.imgUrl, rotate: 0, // 旋转度数
//分类列表 width: 20, //宽
categoryList: [], height: 30, //高
MerchantList: [], // title:'我在这里',//标注点名
pageNum: 1, alpha: 0.5, //透明度
pageSize: 10, callout: { //自定义标记点上方的气泡窗口 点击有效
isNoMoreData: false content: '天宝大厦', //文本
// loadingText: '点击加载更多' color: '#ffffff', //文字颜色
} fontSize: 14, //文本大小
}, borderRadius: 15, //边框圆角
onPageScroll(e) { borderWidth: '10',
//兼容iOS端下拉时顶部漂移 bgColor: '#e51860', //背景颜色
if (e.scrollTop >= 0) { display: 'ALWAYS', //常显
this.headerPosition = "fixed"; },
} else { },
this.headerPosition = "absolute"; {
id: 1234597,
latitude: 23.106574, //纬度
longitude: 113.324587, //经度
iconPath: '../../../static/img/user/user5.png', //显示的图标
rotate: 0, // 旋转度数
width: 20, //宽
height: 30, //高
// title:'我在这里',//标注点名
alpha: 0.5, //透明度
// label:{//为标记点旁边增加标签 //因背景颜色H5不支持
// color:'red',//文本颜色
// },
callout: { //自定义标记点上方的气泡窗口 点击有效
content: '广州塔', //文本
color: '#ffffff', //文字颜色
fontSize: 14, //文本大小
borderRadius: 15, //边框圆角
borderWidth: '10',
bgColor: '#e51860', //背景颜色
display: 'ALWAYS', //常显
},
},
{
id: 2,
latitude: 23.1338, //纬度
longitude: 113.33052, //经度
iconPath: '../../../static/img/user/user5.png', //显示的图标
rotate: 0, // 旋转度数
width: 20, //宽
height: 30, //高
alpha: 0.5, //透明度
callout: { //自定义标记点上方的气泡窗口 点击有效
content: '德隆大厦', //文本
color: '#ffffff', //文字颜色
fontSize: 14, //文本大小
borderRadius: 15, //边框圆角
borderWidth: '10',
bgColor: '#e51860', //背景颜色
display: 'ALWAYS', //常显
},
},
{
id: 3,
latitude: 23.136455, //纬度
longitude: 113.329002, //经度
iconPath: '../../../static/img/user/user5.png', //显示的图标
rotate: 0, // 旋转度数
width: 20, //宽
height: 30, //高
alpha: 0.5, //透明度
callout: { //自定义标记点上方的气泡窗口 点击有效
content: '羊城国际商贸中心', //文本
color: '#ffffff', //文字颜色
fontSize: 14, //文本大小
borderRadius: 15, //边框圆角
borderWidth: '10',
bgColor: '#e51860', //背景颜色
display: 'ALWAYS', //常显
},
},
{
id: 4,
latitude: 23.224781, //纬度
longitude: 113.293911, //经度
iconPath: '../../../static/img/user/user5.png', //显示的图标
rotate: 0, // 旋转度数
width: 20, //宽
height: 30, //高
alpha: 0.5, //透明度
callout: { //自定义标记点上方的气泡窗口 点击有效
content: '天瑞广场A座', //文本
color: '#ffffff', //文字颜色
fontSize: 16, //文本大小
borderRadius: 15, //边框圆角
borderWidth: '12',
bgColor: '#e51860', //背景颜色
display: 'ALWAYS', //常显
},
},
{
id: 5,
latitude: 23.072726, //纬度
longitude: 113.277921, //经度
iconPath: '../../../static/img/user/user5.png', //显示的图标
rotate: 0, // 旋转度数
width: 20, //宽
height: 30, //高
alpha: 0.5, //透明度
callout: { //自定义标记点上方的气泡窗口 点击有效
content: '大米和小米儿童康复(广州盈丰)中心', //文本
color: '#ffffff', //文字颜色
fontSize: 14, //文本大小
borderRadius: 15, //边框圆角
borderWidth: '8',
bgColor: '#e51860', //背景颜色
display: 'ALWAYS', //常显
},
},
],
typeid: 0, //选择分类
isSelected: 1, //是否选择下拉
selectFirst: 1, //筛选是否有值
selectChiler: 1, // 子菜单筛选
} }
}, },
onLoad() {}, onLoad() {
onShow() {
this.pageNum = 1;
this.categoryList = [];
this.MerchantList = [];
if (app.globalData.cityName != '') {
this.city = app.globalData.qianzhuCityName;
this.getMerchantList();
} else {
this.postionIng();
}
}, },
//上拉加载，需要自己在page.json文件中配置"onReachBottomDistance" computed: {
onReachBottom() { mapheight() {
this.getStoreListByMerchant(); let data = ''
if (this.bottomData) {
if (this.upTop) {
data = '50px'
} else {
data = '200px'
}
} else {
data = '100vh'
}
return data
},
coverbottom() {
let data = ''
if (this.bottomData) {
data = '20rpx'
} else {
data = '200rpx'
}
return data
}
}, },
methods: { methods: {
//显示弹出 //地图点击事件
showPopup() { markertap(e) {},
this.$refs.popup.show(); //地图点击事件
callouttap(e) {
console.log('地图点击事件', e)
}, },
postionIng() { postionIng() {
let that = this; let that = this;
uni.getLocation({ uni.getLocation({
@ -244,361 +381,174 @@
this.categoryList = []; this.categoryList = [];
} }
}) })
},
// 定位点击事件
onControltap() {
}, },
//分类切换显示 //选择类型
showCategory(e) { changeType(item) {
this.showCategoryIndex = this.MerchantList[e.target.value].merchantName; this.typeid = item.id;
this.showCategoryIndexId = this.MerchantList[e.target.value].id;
this.pageNum = 1;
this.pageSize = 10;
this.isNoMoreData = false;
this.categoryList = [];
this.getStoreListByMerchant();
}, },
toCategory(e) { //子菜单显示
uni.navigateTo({ changeChilerType() {
url: '../../goods/store-list/store-details?id=' + e.id + '&juli=' + e.distance if (this.selectChiler == 1) {
}) this.selectChiler = 2;
// uni.navigateTo({ } else {
// url: '../../goods/goods?id=' + e this.selectChiler = 1;
// }); }
uni.setStorage({
key: "store_id",
data: e.id
})
uni.setStorage({
key: "store_juli",
data: e.distance
})
},
//搜索跳转
toSearch() {
uni.navigateTo({
url: '../../goods/HM-search/HM-search'
})
// uni.showToast({title: "建议跳转到新页面做搜索功能"});
}, },
//拨打客服电话 // 是否选择下拉
playPhone() { updateSelected(item) {
let cont = "本服务由惠兑礼品提供\n400-678-0738"; this.isSelected = item;
let content = cont.replace(/<br>/g,"\n");
uni.showModal({
title: '客服',
content: content,
success: function(res) {
if (res.confirm) {
uni.makePhoneCall({
phoneNumber: '4006780738', //电话号码
success: function(e) {
console.log(e);
},
fail: function(e) {
console.log(e);
}
})
}
}
})
} }
} }
} }
</script> </script>
<style lang="scss"> <style lang='less' scoped>
page { .map-container {
background-color: #f1f3f5; position: relative;
} overflow: hidden;
.h5xfimg {
width: 80rpx;
bottom: 140rpx;
position: fixed;
right: 40rpx;
}
.xfimg {
width: 80rpx;
bottom: 60rpx;
position: fixed;
right: 40rpx;
}
.status { .cover-views {
width: 100%; position: absolute;
height: 0; z-index: 99999;
position: fixed; }
z-index: 10;
background-color: #fff;
top: 0;
/* #ifdef APP-PLUS */
height: var(--status-bar-height); //覆盖样式
/* #endif */
}
button::after {
border: none
}
.recontleft {
width: 80px;
margin-left: 10px;
}
.recontright {
margin-left: 100px;
}
.refuel {
padding: 6px 5px;
border-radius: 5px;
background-color: #f6f6f6;
color: #666666;
margin-left: 10px;
margin-top: 15px;
display: inline-block;
font-size: 13px;
width: 18%;
text-align: center;
}
.activeRefuel { .cover-view-cont {
padding: 6px 5px; display: flex;
border-radius: 5px; flex-direction: row;
border: 1px solid #089bf5; flex-wrap: nowrap;
color: #089bf5; white-space: nowrap;
margin-left: 10px; }
margin-top: 15px;
display: inline-block;
font-size: 13px;
width: 18%;
text-align: center;
}
.stuMenu { .cover-view-head {
width: 33.3%; height: 35px;
height: 30px; line-height: 35px;
line-height: 30px; background-color: #fff;
font-size: 14px; display: inline-table;
margin-top: 10px; flex-direction: column;
color: #333333; text-align: center;
} position: relative;
margin-right: 15px;
border-radius: 22px;
padding: 0 10px;
}
.stuimg { .cover-viewchage {
width: 10px; height: 35px;
vertical-align: middle; }
}
.loading-text { .onchange {
width: 100%; color: #089bf5;
display: flex; }
justify-content: center;
align-items: center;
height: 60upx;
color: #979797;
font-size: 24upx;
}
.header { .onclick {
width: 92%; background-color: #089bf5;
padding: 0 4%; color: #fff;
height: 100upx; }
display: flex;
align-items: center;
position: fixed;
top: 0;
z-index: 10;
background-color: #0083f5;
/* #ifdef APP-PLUS */
top: var(--status-bar-height);
/* #endif */
.addr { .cover-view-loca {
width: 120upx;
height: 60upx;
flex-shrink: 0;
color: #FFFFFF;
display: flex; display: flex;
flex-direction: column;
align-items: center; align-items: center;
font-size: 28upx; justify-content: center;
width: 40px;
height: 40px;
color: #484848;
background-color: #fff;
background-size: 60px 60px;
background-position: center center;
position: absolute;
bottom: 100px;
right: 16px;
}
.icon { .cover-image {
height: 60upx; display: inline-block;
margin-right: 5upx; width: 15px;
display: flex; height: 15px;
align-items: center;
font-size: 42upx;
color: #ffc50a;
}
} }
.input-box { .cover-view-foot {
text-align: center;
height: 200rpx;
background-color: #fff;
position: absolute;
bottom: 0px;
width: 100%; width: 100%;
height: 70rpx; border-radius: 18px 18px 0 0;
background-color: #f5f5f5; }
border-radius: 10rpx;
position: relative;
display: flex;
align-items: center;
.icon {
display: flex;
align-items: center;
position: absolute;
top: 0;
right: 0;
width: 60upx;
height: 60upx;
font-size: 34upx;
color: #c0c0c0;
}
input { .change-cont {
padding-left: 28upx; position: absolute;
height: 28upx; z-index: 99999999;
font-size: 28upx; top: 100px;
width: 100%; background-color: #333;
} width: 100%;
opacity: 0.8;
height: calc(100% - 100px);
} }
.icon-btn { .change-optiac {
width: 60upx; position: absolute;
height: 60upx; z-index: 99999999;
flex-shrink: 0; top: 100px;
display: flex; width: 100%;
background-color: #fff;
height: 260px;
}
.icon { .cover-view-foot-behind {
width: 60upx; text-align: center;
height: 60upx; height: calc(100% - 110px);
display: flex; background-color: #fff;
justify-content: center; position: absolute;
align-items: center; z-index: 999999;
font-size: 42upx; bottom: 0px;
background-color: transparent; width: 100%;
} border-radius: 18px 18px 0 0;
} }
} }
.place { .scoroll-cont {
height: calc(100% - 80px);
}
background-color: #ffffff; .line-view {
height: 100upx; width: 10%;
/* #ifdef APP-PLUS */ margin-left: 45%;
margin-top: var(--status-bar-height); height: 5px;
/* #endif */ border-radius: 12px;
margin-top: 10px;
background-color: #f0f0f0;
} }
.category-list { .input-box {
width: 100%; width: 90%;
margin-left: 5%;
margin-top: 5px;
text-align: left;
height: 70rpx;
background-color: #f0f0f0;
border-radius: 22px;
position: relative;
align-items: center;
display: flex; display: flex;
.left, input {
.right { padding-left: 12px;
position: absolute; padding-right: 12px;
height: 30px;
top: 100upx; color: #666;
/* #ifdef APP-PLUS */ font-size: 14px;
top: calc(100upx + var(--status-bar-height)); width: 100%;
/* #endif */
bottom: 0upx;
}
.left {
width: 24%;
left: 0upx;
background-color: #f2f2f2;
.row {
width: 100%;
height: 90upx;
display: flex;
align-items: center;
.text {
width: 100%;
position: relative;
font-size: 28upx;
display: flex;
justify-content: center;
color: #3c3c3c;
.block {
position: absolute;
width: 0upx;
left: 0;
}
}
&.on {
height: 100upx;
background-color: #fff;
.text {
font-size: 30upx;
font-weight: 600;
color: #2d2d2d;
.block {
width: 10upx;
height: 80%;
top: 10%;
background-color: #0083f5;
}
}
}
}
} }
}
.right { .onclick {
width: 76%; background-color: #089bf5;
left: 24%; color: #fff;
.category {
width: 94%;
padding: 20upx 3%;
.banner {
width: 100%;
height: 24.262vw;
border-radius: 10upx;
overflow: hidden;
box-shadow: 0upx 5upx 20upx rgba(0, 0, 0, 0.3);
image {
width: 100%;
height: 24.262vw;
}
}
.list {
margin-top: 40upx;
width: 100%;
display: flex;
flex-wrap: wrap;
.box {
width: calc(70vw / 2);
margin-bottom: 30upx;
display: flex;
justify-content: center;
align-items: center;
flex-wrap: wrap;
image {
width: 60%;
height: calc(70vw / 2 * 0.6);
}
.text {
margin-top: 5upx;
width: 80%;
display: flex;
justify-content: center;
font-size: 26upx;
}
}
}
}
}
} }
</style> </style>

2030
pages/tabBar/home/home.vue
View File

File diff suppressed because one or more lines are too long

2
pages/user/coupon/coupon.vue
Unescape View File

@ -220,7 +220,7 @@
font-size: 16px; font-size: 16px;
} }
</style> </style>
<button class="download" style="height:40px;line-height: 40PX;width:100%;border:none;">立即使用</button> <button class="download" style="height:40px;line-height: 40PX;width:100%;border:none;">去使用</button>
</script> </script>
</wx-open-launch-weapp> </wx-open-launch-weapp>

145
pages/user/order_list/order_list.vue
Unescape View File

@ -43,7 +43,7 @@
</view> </view>
</view> </view>
<view class="width96 height22 mart10"> <view v-if="row.productType != 12" class="width96 height22 mart10">
<view class="width70 flleft fotlt "> <view class="width70 flleft fotlt ">
<view class="font16 fontwig6 fcor333 alijusstart"> <view class="font16 fontwig6 fcor333 alijusstart">
<image mode="widthFix" src="../../../static/img/order2.png" v-if="row.productType == 4" <image mode="widthFix" src="../../../static/img/order2.png" v-if="row.productType == 4"
@ -60,22 +60,56 @@
class="marglerig" style="width: 50rpx;height: 50rpx;"></image> class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
<image mode="widthFix" src="../../../static/img/order7.png" v-if="row.productType == 1" <image mode="widthFix" src="../../../static/img/order7.png" v-if="row.productType == 1"
class="marglerig" style="width: 50rpx;height: 50rpx;"></image> class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
<image mode="widthFix" src="../../../static/img/unioncard.png" v-if="row.productType == 8" <image mode="widthFix" src="../../../static/img/unioncard.png"
class="marglerig" style="width: 50rpx;height: 50rpx;"></image> v-if="row.productType == 8" class="marglerig" style="width: 50rpx;height: 50rpx;">
</image>
<image mode="widthFix" src="../../../static/img/order9.png" v-if="row.productType == 2" <image mode="widthFix" src="../../../static/img/order9.png" v-if="row.productType == 2"
class="marglerig" style="width: 50rpx;height: 50rpx;"></image> class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
<image mode="widthFix" :src="imageUrl+'orderLogo/goods.png'" v-if="row.productType == 12" <view class="width100 text1" >{{row.title}}</view>
class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
<view class="width100 text1">{{row.title}}</view>
</view> </view>
</view> </view>
<view v-if="row.productType != 12" class="width30 flright fotrt fcor666 font15 fotrt"> <view class="width30 flright fotrt fcor666 font15 fotrt">
<view class="font14 fcor333"> <view class="font14 fcor333">
x1 x1
</view> </view>
</view> </view>
</view> </view>
<view v-if="row.productType == 12" class="width96 height22 mart10">
<view class="width70 flleft fotlt ">
<view class="font16 fontwig6 fcor333 alijusstart">
<image mode="widthFix" :src="imageUrl+'orderLogo/goods.png'" class="marglerig" style="width: 50rpx;height: 50rpx;">
</image>
<!-- <view class="width100 text1" v-if="row.productType != 12">{{row.title}}</view> -->
<!-- <view class="po-ra" v-if="row.productType == 12&&row.ext6.split(',').length>1">
<scroll-view class="settle-goods" scroll-x="true">
<view class="settle-con">
<view class="settle-img" v-for="item in row.ext6.split(',')">
<image class="st-img" :src="imageUrl+'item'" mode="aspectFill"></image>
</view>
</view>
</scroll-view>
<view class="fix-soon fcor666">
<view class="fix-price">
<text class="icon-ymt to-right font14 fcor666"></text>
</view>
</view>
</view> -->
</view>
</view>
<!-- <view class="width30 flright fotrt fcor666 font15 fotrt">
<view class="font14 fcor333">
x1
</view>
</view> -->
</view>
<view class="width96 mart10 font12 fcor999"> <view class="width96 mart10 font12 fcor999">
订单编号:{{row.orderNo}} 订单编号:{{row.orderNo}}
</view> </view>
@ -103,12 +137,12 @@
</block> </block>
</view> </view>
</view> </view>
<!-- start --> <!-- start -->
<!-- end --> <!-- end -->
</view> </view>
</view> </view>
@ -121,15 +155,15 @@
orderCheck, orderCheck,
getDictionaryByCodeType getDictionaryByCodeType
} from '../../../Utils/Api.js'; } from '../../../Utils/Api.js';
import orderList from '@/pages/classify/order/orderList.vue' import orderList from '@/pages/classify/order/orderList.vue'
let app = getApp() let app = getApp()
export default { export default {
data() { data() {
return { return {
imagewxUrl: app.globalData.imageWxImg, imagewxUrl: app.globalData.imageWxImg,
imgadres: 'noorder.png', imgadres: 'noorder.png',
imgadres1: 'dhf.png', imgadres1: 'dhf.png',
headerTop: "0px", headerTop: "0px",
@ -161,10 +195,12 @@
codeName: '全部' codeName: '全部'
}], //订单类型 }], //订单类型
ordertypeid: '', //类型id ordertypeid: '', //类型id
couponName: '' //搜索名称 couponName: '', //搜索名称
goodsList: [], //实物商品图片
} }
}, },
components:{ components: {
orderList orderList
}, },
onLoad(option) { onLoad(option) {
@ -284,13 +320,13 @@
return; return;
} }
//实物类型 //实物类型
if(item == 12){ if (item == 12) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/classify/order/orderDetail?id='+e url: '/pages/classify/order/orderDetail?id=' + e
}) })
return; return;
} }
uni.navigateTo({ uni.navigateTo({
url: '../order_details/order_details?id=' + e url: '../order_details/order_details?id=' + e
}) })
@ -394,6 +430,73 @@
</script> </script>
<style lang="scss"> <style lang="scss">
//实物样式
.po-ra {
position: relative;
}
.settle-goods {
width: auto;
}
.settle-con {
display: flex;
justify-content: flex-start;
align-items: center;
.settle-img {
font-size: 0;
margin-left: 10px;
.st-img {
width: 82px;
height: 82px;
}
}
.settle-msg {
flex: 1;
padding: 0 10px;
.settle-title {
display: flex;
justify-content: space-between;
align-items: center;
}
}
}
.fix-soon {
position: absolute;
right: 0;
top: 0;
width: 82px;
height: 82px;
// line-height: 82px;
opacity: 0.8;
background-color: #ffffff;
text-align: center;
}
.fix-price {
height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
&>text {
width: 100%;
}
}
//
page { page {
background-color: #f3f3f3; background-color: #f3f3f3;
} }

BIN
static/img/bgimg.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 15 KiB

Write Preview
Loading…
Cancel
Save