Leadfyy.co
/
uniapp-hainan
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/uniapp-hainan

test
邓平艺 4 years ago
parent
42bb7f3871 92abf520d8
commit
de4dd048ef
12 changed files with 36 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      components/lf-waterfall/lf-waterfall.vue
  2. 2
      pages/about/index.vue
  3. 6
      pages/channel/index.vue
  4. 6
      pages/discover/discover.vue
  5. 6
      pages/goodsDetail/index.vue
  6. 19
      pages/index/index.vue
  7. 2
      pages/message/detail.vue
  8. 2
      pages/notice/article.vue
  9. 2
      pages/notice/notice.vue
  10. 4
      pages/order/order.vue
  11. 5
      pages/order/order_details.vue
  12. BIN
      static/defult_code.png

3
components/lf-waterfall/lf-waterfall.vue
View File

@ -144,7 +144,8 @@
bottom: 0; bottom: 0;
right: 0; right: 0;
background-color: rgba(0,0,0,0.5); background-color: rgba(0,0,0,0.5);
width: 140rpx;
width: max-content;
padding: 0 20rpx;
height: 48rpx; height: 48rpx;
border-radius: 20rpx 0rpx 0rpx 0rpx; border-radius: 20rpx 0rpx 0rpx 0rpx;
font-size: 22rpx; font-size: 22rpx;

2
pages/about/index.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view>
<view class="lf-m-l-32 lf-m-r-32">
<rich-text :nodes="content" v-if="$isRight(content)"></rich-text> <rich-text :nodes="content" v-if="$isRight(content)"></rich-text>
<lf-nocontent v-else></lf-nocontent> <lf-nocontent v-else></lf-nocontent>
<!-- 回到顶部 --> <!-- 回到顶部 -->

6
pages/channel/index.vue
View File

@ -177,9 +177,11 @@
text-align: center; text-align: center;
line-height: 82rpx; line-height: 82rpx;
background-color: #FFFFFF; background-color: #FFFFFF;
margin-right: -2rpx;
margin-top: -2rpx;
// margin-right: -2rpx;
// margin-top: -2rpx;
box-sizing: border-box; box-sizing: border-box;
margin: 6rpx;
border-radius: 20rpx;
} }
.active{ .active{
border: 1rpx solid #FF0000; border: 1rpx solid #FF0000;

6
pages/discover/discover.vue
View File

@ -2,13 +2,13 @@
<view class="page-color"> <view class="page-color">
<view class="padding-lr lf-p-t-30" v-if="article_list.length"> <view class="padding-lr lf-p-t-30" v-if="article_list.length">
<view class="card-discover lf-m-b-30" v-for="(item,index) of article_list" :key="index"> <view class="card-discover lf-m-b-30" v-for="(item,index) of article_list" :key="index">
<view @click="$url('/pages/notice/article?article_id='+item.big.id)" v-if="item.big">
<image :src="item.big.image" mode="aspectFill" style="width: 686rpx;height: 300rpx;"></image>
<view class="lf-h-100 lf-w-100 lf-flex" @click="$url('/pages/notice/article?article_id='+item.big.id)" v-if="item.big">
<image :src="item.big.image" mode="aspectFill" style="width: 700rpx;height: 300rpx;border-radius: 20rpx 20rpx 0 0;"></image>
</view> </view>
<view class="flex-direction bg-white discover-radius" v-if="item.children"> <view class="flex-direction bg-white discover-radius" v-if="item.children">
<view class="flex align-center text-center lf-p-30 solid-bottom" v-for="(i,index) of item.children" :key="index" @click="$url('/pages/notice/article?article_id='+i.id)"> <view class="flex align-center text-center lf-p-30 solid-bottom" v-for="(i,index) of item.children" :key="index" @click="$url('/pages/notice/article?article_id='+i.id)">
<view> <view>
<image :src="i.image" mode="aspectFill" style="width: 100rpx;height: 100rpx;"></image>
<image :src="i.image" mode="aspectFill" style="width: 100rpx;height: 100rpx;border-radius: 10rpx;"></image>
</view> </view>
<view class="lf-line-2 lf-color-333 lf-font-28 lf-text-left lf-m-l-20" style="line-height: 44rpx;"> <view class="lf-line-2 lf-color-333 lf-font-28 lf-text-left lf-m-l-20" style="line-height: 44rpx;">
{{i.title}} {{i.title}}

6
pages/goodsDetail/index.vue
View File

@ -102,7 +102,7 @@
} }
}, },
onLoad(options){ onLoad(options){
this.goods_id = options.goods_id;
this.goods_id = options.goods_id || options.id;
console.log('商品',this.goods_id) console.log('商品',this.goods_id)
this.getGoodsDetail(); this.getGoodsDetail();
@ -204,8 +204,8 @@
}, },
onShareAppMessage(){ onShareAppMessage(){
let goods = this.goods_detail; let goods = this.goods_detail;
let title = goods.name;
let imageUrl = goods.share_cover || goods.cover;
let title = goods.title;
let imageUrl = goods.pictures[0] || goods.picture;
let path = '/pages/route/index?route=goods_detail&id='+ goods.id; let path = '/pages/route/index?route=goods_detail&id='+ goods.id;
console.log("path", path); console.log("path", path);
return { return {

19
pages/index/index.vue
View File

@ -59,7 +59,7 @@
</view> </view>
</view> </view>
<view> <view>
<view class="recomm-img" @click="$url('/pages/goodsDetail/index?goods_id='+hot_list[1].id)">
<view class="recomm-img" style="margin-bottom: 14rpx;" @click="$url('/pages/goodsDetail/index?goods_id='+hot_list[1].id)">
<image :src="hot_list[1].picture" class="lf-w-100 lf-h-100"></image> <image :src="hot_list[1].picture" class="lf-w-100 lf-h-100"></image>
</view> </view>
<view class="recomm-img lf-m-t-10" @click="$url('/pages/goodsDetail/index?goods_id='+hot_list[2].id)"> <view class="recomm-img lf-m-t-10" @click="$url('/pages/goodsDetail/index?goods_id='+hot_list[2].id)">
@ -68,7 +68,7 @@
</view> </view>
</view> </view>
<view class="lf-row-between lf-m-t-10"> <view class="lf-row-between lf-m-t-10">
<view class="recomm-img" @click="$url('/pages/goodsDetail/index?goods_id='+item.id)" :key="index" v-for="(item,index) of hot_list" v-if="index>2">
<view class="recomm-img" style="margin-top: 4rpx;" @click="$url('/pages/goodsDetail/index?goods_id='+item.id)" :key="index" v-for="(item,index) of hot_list" v-if="index>2">
<image :src="item.picture" class="lf-w-100 lf-h-100"></image> <image :src="item.picture" class="lf-w-100 lf-h-100"></image>
</view> </view>
</view> </view>
@ -131,6 +131,15 @@
this.getIndexData() this.getIndexData()
this.getFavourite() this.getFavourite()
}, },
onLoad(options) {
if (options.scene) {
// 单个参数
let str = decodeURIComponent(options.scene);
this.$http(this.API.API_CONFIRM_CODE, {verify_code: str}).then(res => {
this.$msg('核销成功!');
});
}
},
methods: { methods: {
//获取猜你喜欢 //获取猜你喜欢
getFavourite() { getFavourite() {
@ -192,6 +201,7 @@
onPullDownRefresh(){ onPullDownRefresh(){
this.getIndexData() this.getIndexData()
this.getFavourite() this.getFavourite()
uni.stopPullDownRefresh()
}, },
onShareAppMessage(){ onShareAppMessage(){
let shareInfo = { let shareInfo = {
@ -311,13 +321,14 @@
.recomm-img{ .recomm-img{
width: 222rpx; width: 222rpx;
height: 222rpx; height: 222rpx;
border-radius: 5rpx;
border-radius: 15rpx;
overflow: hidden;
} }
.max-recomm-img{ .max-recomm-img{
width: 455rpx; width: 455rpx;
height: 455rpx; height: 455rpx;
position: relative; position: relative;
border-radius: 5rpx;
border-radius: 15rpx;
overflow: hidden; overflow: hidden;
.recomm-title{ .recomm-title{
// height: 142rpx; // height: 142rpx;

2
pages/message/detail.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view>
<view class="lf-m-l-32 lf-m-r-32">
<rich-text :nodes="content" v-if="$isRight(content)"></rich-text> <rich-text :nodes="content" v-if="$isRight(content)"></rich-text>
<lf-nocontent v-else></lf-nocontent> <lf-nocontent v-else></lf-nocontent>
<!-- 回到顶部 --> <!-- 回到顶部 -->

2
pages/notice/article.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view>
<view class="lf-m-l-32 lf-m-r-32">
<rich-text :nodes="content" v-if="content"></rich-text> <rich-text :nodes="content" v-if="content"></rich-text>
<lf-nocontent v-else></lf-nocontent> <lf-nocontent v-else></lf-nocontent>
<!-- 回到顶部 --> <!-- 回到顶部 -->

2
pages/notice/notice.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view>
<view class="lf-m-l-32 lf-m-r-32">
<rich-text :nodes="content" v-if="content"></rich-text> <rich-text :nodes="content" v-if="content"></rich-text>
<lf-nocontent v-else></lf-nocontent> <lf-nocontent v-else></lf-nocontent>
<!-- 回到顶部 --> <!-- 回到顶部 -->

4
pages/order/order.vue
View File

@ -79,7 +79,7 @@
isPage: true isPage: true
}, { }, {
name: '已付款', name: '已付款',
type: 1,
type: '1,2,3',
list: [], list: [],
loadingClass: true, loadingClass: true,
loadingText: '正在加载中', loadingText: '正在加载中',
@ -97,7 +97,7 @@
}, },
{ {
name: '售后', name: '售后',
type: 6,
type: '6,7,8',
list: [], list: [],
loadingClass: true, loadingClass: true,
loadingText: '正在加载中', loadingText: '正在加载中',

5
pages/order/order_details.vue
View File

@ -67,8 +67,9 @@
<view class="bg-white flex flex-direction justify-around align-center text-center padding-tb" <view class="bg-white flex flex-direction justify-around align-center text-center padding-tb"
style="padding-bottom: 140rpx;"> style="padding-bottom: 140rpx;">
<view> <view>
<tki-qrcode ref="qrcode" @result="qrR" :val="checkArea" :size="115" unit="px" background="#fff"
foreground="#000" pdground="#000" :onval="true" :loadMake="true" />
<!-- <tki-qrcode ref="qrcode" @result="qrR" :val="checkArea" :size="115" unit="px" background="#fff"
foreground="#000" pdground="#000" :onval="true" :loadMake="true" /> -->
<image src="../../static/defult_code.png" mode="aspectFill" style="width: 300rpx;height: 300rpx;"></image>
</view> </view>
<view style="margin-top: 10rpx;position: relative;top: 26rpx;"> <view style="margin-top: 10rpx;position: relative;top: 26rpx;">
<view class="lf-font-28 text-black1"> <view class="lf-font-28 text-black1">

BIN
static/defult_code.png
View File

Side by Side

After

Width: 430  |  Height: 430  |  Size: 74 KiB

Write Preview
Loading…
Cancel
Save