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

优化，样式

Browse Source
youmengting-dev
游梦婷 1 year ago
parent 1e05bbe600
commit d91cceda36
10 changed files with 100 additions and 45 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. 20
      common/share.js
  2. 48
      pages/goods/goods-list/goods-list.vue
  3. 6
      pages/goods/goods.vue
  4. 6
      pages/goods/refuel-details/refuel-details.vue
  5. 2
      pages/goods/refuel/refuel.vue
  6. 2
      pages/tabBar/home/home.vue
  7. 7
      physical-merchants/classify/cart/cart.vue
  8. 12
      physical-merchants/classify/goodsDetail/goodsDetail.vue
  9. 29
      subPages/coupon-package/coupon-package.vue
  10. 7
      subPages/coupon-packge-details/coupon-packge-details.vue

20
common/share.js
Unescape View File

@ -93,17 +93,28 @@ export default {
}) })
} }
}, },
isGoHome(){ isGoHome(path){
/* 黑名单：不允许分享 */ /* 黑名单：不允许分享,分享的跳转至首页 */
let arr =[ let arr =[
"/physical-merchants/settleAccounts/settleAccounts",//订单确认 "/physical-merchants/settleAccounts/settleAccounts",//订单确认
"/physical-merchants/classify/order/pay",//收银台页 "/physical-merchants/classify/order/pay",//收银台页
"/physical-merchants/classify/order/paymentResult",//支付结果 "/physical-merchants/classify/order/paymentResult",//支付结果
]; ];
// #ifdef H5
let str = this.localPath.split('#')[1]; let str = this.localPath.split('#')[1];
str = str.split("?")[0]; str = str.split("?")[0];
return arr.includes(str) return arr.includes(str)
// #endif
// #ifdef MP-WEIXIN
return arr.includes(path)
// #endif
}, },
}, },
@ -147,6 +158,11 @@ export default {
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
onShareAppMessage(res) { onShareAppMessage(res) {
this.share.path = this.getCurrentRouteYm(); this.share.path = this.getCurrentRouteYm();
if(this.isGoHome(this.share.path.split('?')[0])){
this.share.path = "/pages/tabBar/home/home"
}
// console.log(this.share.path, "this.share.path", res); // console.log(this.share.path, "this.share.path", res);
return { return {
title: this.share.title, title: this.share.title,

48
pages/goods/goods-list/goods-list.vue
Unescape View File

@ -5,16 +5,21 @@
<input placeholder="搜索商品" v-model="couponName" placeholder-style="color:#c0c0c0;" @input="toSearch()" /> <input placeholder="搜索商品" v-model="couponName" placeholder-style="color:#c0c0c0;" @input="toSearch()" />
</view> </view>
<view class="swiper"> <view class="swiper" v-if="swiperList.length>0">
<view class="swiper-box"> <view class="swiper-box" >
<swiper circular="true" autoplay="true" @change="swiperChange"> <swiper circular="true" autoplay="true" @change="swiperChange">
<swiper-item v-for="swiper in swiperList" :key="swiper.id"> <swiper-item v-for="swiper in swiperList" :key="swiper.id">
<image :src="imageUrl+swiper.imgData" @click="jumpCont(swiper)"></image> <image :src="imageUrl+swiper.imgData" @click="jumpCont(swiper)"></image>
</swiper-item> </swiper-item>
</swiper> </swiper>
<view class="indicator"> <!-- <view class="indicator">
<view class="dots" v-for="(swiper, index) in swiperList" <view class="dots" v-for="(swiper, index) in swiperList"
:class="[currentSwiper >= index ? 'on' : '']" :key="index"></view> :class="[currentSwiper >= index ? 'on' : '']" :key="index"></view>
</view> -->
<view class="indicator" >
<view class="dots" v-for="(swiper, index) in swiperList"
:style="(currentSwiper >= index ? 'width:calc(100%/'+swiperList.length+')' : '')"
:key="index"></view>
</view> </view>
</view> </view>
</view> </view>
@ -27,8 +32,8 @@
<view v-if="goodsList == '' " class="mart60 fotct font14 fcor666"> <view v-if="goodsList == '' " class="mart60 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image> <image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
</view> </view>
<view class="width90 height110 mart10 backcorfff border-8r alijusstart" v-for="(row, index) in goodsList" :key="index" @click="toGoods(row.id)"> <view class="width90 height110 mart10 border-8r itemContainer" v-for="(row, index) in goodsList" :key="index" @click="toGoods(row.id)">
<image class="goodsimg mart5" mode="widthFix" :src="imageUrl+row.couponImg"></image> <image class="goodsimg flleft" mode="aspectFit" :src="imageUrl+row.couponImg"></image>
<view class="goodsli width65"> <view class="goodsli width65">
<view class="text1 fcor333 font16 fontwig6">{{row.couponName}}</view> <view class="text1 fcor333 font16 fontwig6">{{row.couponName}}</view>
<view class="goodsxg font12 fotct">限购{{row.limitNumber}}件</view> <view class="goodsxg font12 fotct">限购{{row.limitNumber}}件</view>
@ -53,8 +58,10 @@
</view> </view>
</view> </view>
</view> </view>
<view class="height10">
</view> </view>
</view>
</template> </template>
<script> <script>
@ -73,16 +80,17 @@
imgadres: 'noorder.png', imgadres: 'noorder.png',
imageUrl: app.globalData.imgUrl, imageUrl: app.globalData.imgUrl,
// 轮播图片 // 轮播图片
swiperList: [{ swiperList: [
id: 1, // {
src: 'url1', // id: 1,
img: 'banner2.png' // src: 'url1',
}, // img: 'banner2.png'
{ // },
id: 2, // {
src: 'url2', // id: 2,
img: 'banner3.png' // src: 'url2',
} // img: 'banner3.png'
// }
], ],
currentSwiper: 0, currentSwiper: 0,
pageNum: 1, pageNum: 1,
@ -397,7 +405,7 @@
} }
.goodsli { .goodsli {
margin-left: 10px; margin-left: 100px;
padding-top: 5px; padding-top: 5px;
} }
@ -406,9 +414,15 @@
border: 1px solid #3da7e7; border: 1px solid #3da7e7;
border-radius: 5px; border-radius: 5px;
color: #3da7e7; color: #3da7e7;
width: 55px; // width: 55px;
display: inline-block;
padding: 3px; padding: 3px;
} }
.itemContainer{
box-sizing: border-box;
padding: 10px;
background: #ffffff;
}
// .info { // .info {
// display: flex; // display: flex;

6
pages/goods/goods.vue
Unescape View File

@ -73,11 +73,13 @@
<!-- 详情 --> <!-- 详情 -->
<view class="description"> <view class="description">
<view class="title">———— 商品详情 ————</view> <view class="title">———— 商品详情 ————</view>
<view class="content marb65"> <view class="content ">
<image mode="widthFix" class="width100" v-for="codes in couponDesc" :key="codes" :src="imageUrl+codes" <image mode="widthFix" class="width100 verc" v-for="codes in couponDesc" :key="codes" :src="imageUrl+codes"
@click="perImage(codes)"> @click="perImage(codes)">
</image> </image>
</view> </view>
<view style="height: 48px;">
</view>
</view> </view>
<wybPopup ref="popup" type="bottom" width="500" scrollY="true" radius="6" :showCloseIcon="true"> <wybPopup ref="popup" type="bottom" width="500" scrollY="true" radius="6" :showCloseIcon="true">
<view class="fotct font18 fontwig6 fcor333 mart10 height30">赠送卡券</view> <view class="fotct font18 fontwig6 fcor333 mart10 height30">赠送卡券</view>

6
pages/goods/refuel-details/refuel-details.vue
Unescape View File

@ -110,7 +110,7 @@
</view> </view>
<view class="line10 mart15"></view> <view class="line10 mart15"></view>
<view class="height60 width100"></view> <view class=" width100" style="height: 51px;"></view>
<!-- 底部按钮 --> <!-- 底部按钮 -->
<view class="footer"> <view class="footer">
<view class="flleft padleft15 font15 fcoreb5"> <view class="flleft padleft15 font15 fcoreb5">
@ -128,7 +128,7 @@
<!-- #endif --> <!-- #endif -->
</view> </view>
<!-- 底部弹窗 --> <!-- 底部弹窗 -->
<wybPopup ref="popup" type="bottom" height="600" width="500" radius="6" :showCloseIcon="true"> <wybPopup ref="popup" type="bottom" height="500" width="500" radius="6" :showCloseIcon="true">
<view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 1">选择油号</view> <view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 1">选择油号</view>
<view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 2">选择油枪</view> <view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 2">选择油枪</view>
<view class="font15 fcor666 width90 mart10 height22" v-if="typeId == 1">汽油油号</view> <view class="font15 fcor666 width90 mart10 height22" v-if="typeId == 1">汽油油号</view>
@ -147,7 +147,7 @@
</view> </view>
</view> </view>
</wybPopup> </wybPopup>
<view class="height30"></view> <!-- <view class="height30"></view> -->
<wybPopup ref="popups" type="center" height="850" width="600" bgColor="" radius="20" :showCloseIcon="false"> <wybPopup ref="popups" type="center" height="850" width="600" bgColor="" radius="20" :showCloseIcon="false">
<!-- <image class="popImg" :src="imagewxUrl+imgadres3" @click="jumpWeb"></image> --> <!-- <image class="popImg" :src="imagewxUrl+imgadres3" @click="jumpWeb"></image> -->

2
pages/goods/refuel/refuel.vue
Unescape View File

@ -48,7 +48,7 @@
</view> </view>
</view> </view>
<wybPopup ref="popup" type="bottom" height="800" width="500" radius="6" :showCloseIcon="false"> <wybPopup ref="popup" type="bottom" height="500" width="500" radius="6" :showCloseIcon="false">
<view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 1">筛选距离</view> <view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 1">筛选距离</view>
<!-- <view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 2">优先条件</view> --> <!-- <view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 2">优先条件</view> -->
<view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 3">油号选择</view> <view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 3">油号选择</view>

2
pages/tabBar/home/home.vue
Unescape View File

@ -112,7 +112,7 @@
<view class="width70 font18 fcor333"> <view class="width70 font18 fcor333">
{{item.name}} {{item.name}}
</view> </view>
<view class="width30 font14 fotrt fcor666">更多</view> <view class="width30 font14 fotrt fcor666">更多<text class="icon-ymt to-right fcor666 font14"></text></view>
</view> </view>
<view class="width94 alijusnostart mart20" v-if="item.type == 6 "> <view class="width94 alijusnostart mart20" v-if="item.type == 6 ">
<view class="backcorfff spcarea border-r" v-for="(goods,index1) in item.childDate" :key="index1" <view class="backcorfff spcarea border-r" v-for="(goods,index1) in item.childDate" :key="index1"

7
physical-merchants/classify/cart/cart.vue
Unescape View File

@ -523,7 +523,10 @@
}, },
goClassify(){ goClassify(){
var pages = getCurrentPages(); uni.navigateBack({
})
/* var pages = getCurrentPages();
pages.reverse() pages.reverse()
let index = -1; let index = -1;
pages.map((item,ind)=>{ pages.map((item,ind)=>{
@ -543,7 +546,7 @@
uni.navigateBack({ uni.navigateBack({
delta:index delta:index
}) }) */
}, },

12
physical-merchants/classify/goodsDetail/goodsDetail.vue
Unescape View File

@ -40,7 +40,7 @@
保障 保障
</view> </view>
<view class="color999 font14"> <view class="color999 font14">
破损包赔 · 假一赔四 · 退货运费险 破损包退 · 假一赔四
</view> </view>
<view class="icon-ymt to-right"></view> <view class="icon-ymt to-right"></view>
</view> </view>
@ -60,7 +60,7 @@
</view> --> </view> -->
<!-- 详情 --> <!-- 详情 -->
<view class="font13 goods-desc-img br tc marb10 colorccc"> <view class="font13 goods-desc-img br tc colorccc">
———— 商品详情 ———— ———— 商品详情 ————
</view> </view>
<view style="font-size: 0;" > <view style="font-size: 0;" >
@ -105,7 +105,7 @@
破损包退 破损包退
</view> </view>
<view class="baozhangDescDesc font13 mart10"> <view class="baozhangDescDesc font13 mart10">
签收72小时之内。发现商品破损或商品变形等，保存有限证件，商家24小时内响应并退款，诚信用户享受极速退款 签收72小时之内。发现商品破损或商品变形等，保存有限证件，商家24小时内响应并退款
</view> </view>
</view> </view>
<view> <view>
@ -116,14 +116,14 @@
正品保障,假一赔四 正品保障,假一赔四
</view> </view>
</view> </view>
<view> <!-- <view>
<view class="baozhangTitle fontwig6 font16 mart10"> <view class="baozhangTitle fontwig6 font16 mart10">
七天无理由退换 七天无理由退换
</view> </view>
<view class="baozhangDescDesc font13 mart10"> <view class="baozhangDescDesc font13 mart10">
满足相应条件时，消费者可申请"七天无理由退换货" 满足相应条件时，消费者可申请"七天无理由退换货"
</view> </view>
</view> </view> -->
<view class="fcorfff baozhang-btn " @click="closeBaoZhang"> <view class="fcorfff baozhang-btn " @click="closeBaoZhang">
@ -294,7 +294,7 @@
.imageUrl + temp); .imageUrl + temp);
this.goodsDetail.detailImg = res.return_data.detailImg.split(",").map(temp => this this.goodsDetail.detailImg = res.return_data.detailImg.split(",").map(temp => this
.imageUrl + temp); .imageUrl + temp);
console.log(this.goodsDetail, ) // console.log(this.goodsDetail, )
// let list =item.map(temp=>this.imageUrl + temp) // let list =item.map(temp=>this.imageUrl + temp)

29
subPages/coupon-package/coupon-package.vue
Unescape View File

@ -4,16 +4,21 @@
<view class="icon search"></view> <view class="icon search"></view>
<input placeholder="搜索商品" v-model="couponName" placeholder-style="color:#c0c0c0;" @input="toSearch()" /> <input placeholder="搜索商品" v-model="couponName" placeholder-style="color:#c0c0c0;" @input="toSearch()" />
</view> </view>
<view class="swiper"> <view class="swiper" v-if="swiperList.length>0">
<view class="swiper-box"> <view class="swiper-box">
<swiper circular="true" autoplay="true" @change="swiperChange"> <swiper circular="true" autoplay="true" @change="swiperChange">
<swiper-item v-for="swiper in swiperList" :key="swiper.id"> <swiper-item v-for="swiper in swiperList" :key="swiper.id">
<image :src="imageUrl+swiper.imgData"></image> <image :src="imageUrl+swiper.imgData"></image>
</swiper-item> </swiper-item>
</swiper> </swiper>
<view class="indicator"> <!-- <view class="indicator">
<view class="dots" v-for="(swiper, index) in swiperList" <view class="dots" v-for="(swiper, index) in swiperList"
:class="[currentSwiper >= index ? 'on' : '']" :key="index"></view> :class="[currentSwiper >= index ? 'on' : '']" :key="index"></view>
</view> -->
<view class="indicator" >
<view class="dots" v-for="(swiper, index) in swiperList"
:style="(currentSwiper >= index ? 'width:calc(100%/'+swiperList.length+')' : '')"
:key="index"></view>
</view> </view>
</view> </view>
</view> </view>
@ -21,8 +26,8 @@
<view v-if="goodsList == '' " class="mart60 fotct font14 fcor666"> <view v-if="goodsList == '' " class="mart60 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image> <image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
</view> </view>
<view class="width90 height110 mart5" v-for="(row, index) in goodsList" :key="index" @click="toGoods(row.id)"> <view class="width90 height110 mart10 border-8r itemContainer" v-for="(row, index) in goodsList" :key="index" @click="toGoods(row.id)">
<image class="goodsimg flleft mart5" mode="widthFix" :src="imageUrl+row.listImg"></image> <image class="goodsimg flleft " mode="aspectFit" :src="imageUrl+row.listImg"></image>
<view class="goodsli "> <view class="goodsli ">
<view class="text2 fcor333 font14 fontwig6">{{row.title}}</view> <view class="text2 fcor333 font14 fontwig6">{{row.title}}</view>
<view class="goodsxg font12 fotct">限购{{row.purchaseNum}}件</view> <view class="goodsxg font12 fotct">限购{{row.purchaseNum}}件</view>
@ -34,8 +39,10 @@
</view> </view>
</view> </view>
</view> </view>
<view class="height10">
</view> </view>
</view>
</template> </template>
<script> <script>
@ -162,12 +169,16 @@
</script> </script>
<style lang="scss"> <style lang="scss">
page {
background-color: #f3f3f3;
}
.input-box { .input-box {
width: 90%; width: 90%;
margin-left: 5%; margin-left: 5%;
margin-top: 15px; margin-top: 15px;
height: 70rpx; height: 70rpx;
background-color: #f5f5f5; // background-color: #f5f5f5;
background-color: #ffffff;
border-radius: 10rpx; border-radius: 10rpx;
position: relative; position: relative;
display: flex; display: flex;
@ -261,9 +272,15 @@
border: 1px solid #eb5823; border: 1px solid #eb5823;
border-radius: 5px; border-radius: 5px;
color: #eb5823; color: #eb5823;
width: 55px; // width: 55px;
display: inline-block;
padding: 3px; padding: 3px;
} }
.itemContainer{
box-sizing: border-box;
padding: 10px;
background: #ffffff;
}
.info { .info {
display: flex; display: flex;

7
subPages/coupon-packge-details/coupon-packge-details.vue
Unescape View File

@ -57,11 +57,14 @@
<!-- 详情 --> <!-- 详情 -->
<view class="description"> <view class="description">
<view class="title">———— 商品详情 ————</view> <view class="title">———— 商品详情 ————</view>
<view class="content marb65"> <view class="content ">
<image mode="widthFix" class="width100" v-for="codes in couponDesc" :key="codes" :src="imageUrl+codes" <image mode="widthFix" class="width100 verc" v-for="codes in couponDesc" :key="codes" :src="imageUrl+codes"
@click="perImage(codes)"> @click="perImage(codes)">
</image> </image>
</view> </view>
<view style="height: 48px;">
</view>
</view> </view>
<wybPopup ref="popup" type="bottom" width="500" scrollY="true" radius="6" :showCloseIcon="true"> <wybPopup ref="popup" type="bottom" width="500" scrollY="true" radius="6" :showCloseIcon="true">
<view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券包</view> <view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券包</view>

Write Preview
Loading…
Cancel
Save