mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
weipengfei 2024-02-20 16:52:33 +08:00
parent 78a818552d
commit 069a5993b2
11 changed files with 167 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/Authorize.vue
View File

@ -101,7 +101,8 @@
title: '用户登录', title: '用户登录',
info: '请登录，将为您提供更好的服务！', info: '请登录，将为您提供更好的服务！',
//#ifdef H5 //#ifdef H5
isWeixin: this.$wechat.isWeixin(), // isWeixin: this.$wechat.isWeixin(),
isWeixin: false, // 关闭微信公众号授权登录
//#endif //#endif
//#ifdef MP //#ifdef MP
title: '授权提醒', title: '授权提醒',

2
components/productWindow/index.vue
View File

@ -11,7 +11,7 @@
</view> </view>
<view v-if="isPresell" class="money presell_price"> <view v-if="isPresell" class="money presell_price">
<view> <view>
预售价 <!-- 预售价 -->
￥<text class="num">{{ attr.productSelect.price }}</text> ￥<text class="num">{{ attr.productSelect.price }}</text>
<text v-if="presell_type === 2">定金￥<text class="num">{{ attr.productSelect.down_price }}</text></text> <text v-if="presell_type === 2">定金￥<text class="num">{{ attr.productSelect.down_price }}</text></text>
</view> </view>

5
libs/login.js
View File

@ -51,7 +51,10 @@ export function toLogin(push, pathLogin) {
Cache.set('login_back_url', path); Cache.set('login_back_url', path);
// #ifdef H5 // #ifdef H5
if (isWeixin()) { if (isWeixin()) {
auth.oAuth(); // auth.oAuth();
uni.navigateTo({
url: '/pages/users/login/login_copy',
})
} else { } else {
if (path !== pathLogin) { if (path !== pathLogin) {
push ? uni.navigateTo({ push ? uni.navigateTo({

4
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "惠农生活", "name" : "惠农生活",
"appid" : "__UNI__3A527D1", "appid" : "__UNI__3A527D1",
"description" : "", "description" : "",
"versionName" : "1.8.7", "versionName" : "1.8.8",
"versionCode" : 187, "versionCode" : 188,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {

7
pages/activity/presell/index.vue
View File

@ -167,7 +167,7 @@ import { Toast } from '../../../libs/uniApi.js';
that.getPresellProductList(); that.getPresellProductList();
}, },
goDetails(item) { goDetails(item) {
if(!item.type) return this.$refs.tipspopupRef.open(); // type表示该活动是否能点击 // if(!item.type) return this.$refs.tipspopupRef.open(); // type表示该活动是否能点击
uni.navigateTo({ uni.navigateTo({
url: '/pages/activity/presell_details/index?id=' + item.product_presell_id url: '/pages/activity/presell_details/index?id=' + item.product_presell_id
}) })
@ -423,7 +423,10 @@ import { Toast } from '../../../libs/uniApi.js';
font-size: 24rpx; font-size: 24rpx;
color: #616161; color: #616161;
width: 240rpx; width: 240rpx;
height: 96rpx; // height: 96rpx;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 3; /* 指定显示三行 */
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }

49
pages/activity/presell_details/index.vue
View File

@ -26,7 +26,7 @@
<view v-else class='money p-color skeleton-rect'> <view v-else class='money p-color skeleton-rect'>
￥ ￥
<text class='num'>{{presellInfo.price}}</text> <text class='num'>{{presellInfo.price}}</text>
<text class="price_text">预售价</text> <!-- <text class="price_text">预售价</text> -->
</view> </view>
<view @click="listenerActionSheet" class="fenxiang_btn"> <view @click="listenerActionSheet" class="fenxiang_btn">
<view class='iconfont icon-fenxiang'></view> <view class='iconfont icon-fenxiang'></view>
@ -34,14 +34,15 @@
</view> </view>
</view> </view>
<view class='label acea-row skeleton-rect'> <view class='label acea-row skeleton-rect'>
<view>市场价:￥{{storeInfo.price || ''}}</view> <!-- <view>市场价:￥{{storeInfo.price || ''}}</view>
<view style="margin-left: 30rpx;">已预定:{{presellInfo.seles}}{{ storeInfo.unit_name }}</view> <view style="margin-left: 30rpx;">已预定:{{presellInfo.seles}}</view> -->
<view v-if="storeInfo.unit_name&&storeInfo.unit_name!='无'">单位: {{ storeInfo.unit_name }}</view>
</view> </view>
<view v-if="!storeInfo.atmosphere_pic" class='introduce skeleton-rect'> <view v-if="!storeInfo.atmosphere_pic" class='introduce skeleton-rect'>
<text v-if="(storeInfo.merchant && storeInfo.merchant.type_name)" class="font-bg-red">{{storeInfo.merchant.type_name}}</text> <text v-if="(storeInfo.merchant && storeInfo.merchant.type_name)" class="font-bg-red">{{storeInfo.merchant.type_name}}</text>
<text v-else-if="(storeInfo.merchant && storeInfo.merchant.is_trader)" class="font-bg-red">自营</text> <text v-else-if="(storeInfo.merchant && storeInfo.merchant.is_trader)" class="font-bg-red">自营</text>
{{presellInfo.store_name}}</view> {{presellInfo.store_name}}</view>
<view class="presell_count"> <view class="presell_count" v-if="false">
<view> <view>
<view>预售活动时间：</view> <view>预售活动时间：</view>
<view v-if="presellInfo.start_time && presellInfo.end_time" class="presell_time"> <view v-if="presellInfo.start_time && presellInfo.end_time" class="presell_time">
@ -72,6 +73,9 @@
预售结束后{{ presellInfo.delivery_day }}天内发货 预售结束后{{ presellInfo.delivery_day }}天内发货
</view> </view>
</view> </view>
<view class="presell_count" style="white-space: pre;font-size: 24rpx;">
<view v-html="presellInfo.store_info"></view>
</view>
<view class='coupon acea-row row-between-wrapper skeleton-rect' @click='couponTap' style="margin-top: 20rpx;"> <view class='coupon acea-row row-between-wrapper skeleton-rect' @click='couponTap' style="margin-top: 20rpx;">
<view class='hide line1 acea-row'> <view class='hide line1 acea-row'>
优惠券： 优惠券：
@ -207,7 +211,25 @@
<view class='product-intro' id="past3"> <view class='product-intro' id="past3">
<view class='title'>产品介绍</view> <view class='title'>产品介绍</view>
<view class='conter' v-if="description"> <view class='conter' v-if="description">
<jyf-parser :domain="domain" :html="description.content" ref="article" :tag-style="tagStyle"></jyf-parser> <!-- <jyf-parser :domain="domain" :html="description.content" ref="article" :tag-style="tagStyle"></jyf-parser> -->
<!-- #ifndef APP-PLUS -->
<jyf-parser v-if="description.type == 0 && typeof description.content == 'string'" :domain='domain'
:html="description.content.replace(/<br\/>/ig, '')" ref="article"
:tag-style="tagStyle"></jyf-parser>
<!-- #endif -->
<!-- #ifdef APP-PLUS -->
<view v-if="description.type == 0 && typeof description.content == 'string'" class="description"
v-html="description.content.replace(/<br\/>/ig, '')"></view>
<!-- #endif -->
<view v-else class="product_content">
<view v-if="description.content && description.content.title" class="product_content_title">
{{description.content.title}}
</view>
<block v-if="description.content && description.content.image">
<image v-for="(item,index) in description.content.image" :key="index" :src="item" mode="widthFix" style="background-color: #fff;width: 100vw;">
</image>
</block>
</view>
</view> </view>
<!-- 价格说明 --> <!-- 价格说明 -->
<view v-if="priceRule.content" class="price-info"> <view v-if="priceRule.content" class="price-info">
@ -1275,6 +1297,7 @@
* *
*/ */
downloadFilePromotionCode: function(successFn) { downloadFilePromotionCode: function(successFn) {
return ;
let that = this; let that = this;
let type; let type;
// #ifndef MP // #ifndef MP
@ -2336,4 +2359,20 @@
} }
} }
} }
.product_content{
background-color: #fff;
&_title{
width: 100%;
height: auto;
line-height: 50rpx;
padding: 28rpx;
word-wrap: break-word;
text-align: center;
}
image{
width: 750rpx;
// height: auto;
// height: 750rpx;
}
}
</style> </style>

9
pages/index/index.vue
View File

@ -159,7 +159,8 @@
<activityCard @close="closeActivityCard"></activityCard> <activityCard @close="closeActivityCard"></activityCard>
</uni-popup> </uni-popup>
<activityHome :showClose="false" @click="navgo(`/pages/newActivity/towPrice/towPrice?street_id=${street_id}&townName=${street}`)"></activityHome> <!-- <activityHome :showClose="false" @click="navgo(`/pages/newActivity/towPrice/towPrice?street_id=${street_id}&townName=${street}`)"></activityHome> -->
<!-- <m-tabbar native> <!-- <m-tabbar native>
<template v-slot:tabbar_index_2> <template v-slot:tabbar_index_2>
<view class="custom_style"> <view class="custom_style">
@ -302,9 +303,9 @@ import activityCard from "@/components/activityCard.vue"
}) })
this.selfLocation(); this.selfLocation();
this.$nextTick(()=>{ // this.$nextTick(()=>{
this.$refs.activityPopup.open(); // this.$refs.activityPopup.open();
}) // })
}, },

131
pages/newActivity/giftBag/giftBag.vue
View File

@ -15,29 +15,24 @@
v-for="(item, index) in changeList" :key="index"> v-for="(item, index) in changeList" :key="index">
<image class="item_pic" :src="item.pic"></image> <image class="item_pic" :src="item.pic"></image>
<view class="item_content"> <view class="item_content">
<view class="top"> <view class="top_left"><text class="c_icon">¥</text> <text class="c_content">{{item.count}}</text></view>
<view class="top_left"><text class="c_icon">¥</text> <text class="c_content">{{item.count}}</text> <text class="tips">现在购买礼包即送</text></view>
<view class="top_right"> <view class="top_right">
<text>数量: </text> <text>数量: </text>
<view @click="reduce(item)">- </view> <view @click="reduce(item)">- </view>
<view>{{item.num}} </view> <view style="width: 80rpx;">{{item.num}} </view>
<view @click="append(item)">+ </view> <view @click="append(item)">+ </view>
</view> </view>
</view> </view>
<view class="bottom">
<view class="bottom_item">
<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/re_redpacket.webp"></image>
<view class="text">{{tipType[red_type].red1}}</view>
</view>
<view class="bottom_item">
<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/re_redpacket.webp"></image>
<view class="text">{{tipType[red_type].red2}}</view>
</view>
</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="a_tips">
<view>礼包说明：</view>
<view>购买1000-4999元礼包，补贴对应金额5%的现金抵扣红包</view>
<view>购买5000-9999元礼包，补贴对应金额10%的现金抵扣红包</view>
<view>购买10000-49999元礼包，补贴对应金额15%的现金抵扣红包</view>
<view>购买50000-100000元礼包，补贴对应金额20%的现金抵扣红包</view>
</view> </view>
</view> </view>
<view class="footer"> <view class="footer">
@ -53,23 +48,19 @@
<view class="ref_ref"> <view class="ref_ref">
<view class="ref_top"> <view class="ref_top">
购买礼包金额达到 购买礼包金额达到
<text v-if="red_type==0">100-2000</text> <text v-if="red_type==0">1000-4999</text>
<text v-if="red_type==1">2001-4000</text> <text v-if="red_type==1">5000-9999</text>
<text v-if="red_type==2">4001-20000</text> <text v-if="red_type==2">10000-49999</text>
! <text v-if="red_type==3">50000-100000</text>
</view> </view>
<view class="ref_center"> <view class="ref_center">
赠送红包变为 赠送红包变为
</view> </view>
<view class="ref_bottom"> <view class="ref_bottom">
<view class="bottom_item"> <view class="bottom_item" style="width: 100%;">
<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/re_redpacket.webp"></image> <image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/re_redpacket.webp"></image>
<view class="text">{{tipType[red_type].red1}}</view> <view class="text">{{tipType[red_type].red1}}</view>
</view> </view>
<view class="bottom_item">
<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/re_redpacket.webp"></image>
<view class="text">{{tipType[red_type].red2}}</view>
</view>
</view> </view>
</view> </view>
</uni-popup> </uni-popup>
@ -109,22 +100,22 @@
changeList: [ changeList: [
{ {
count: 100, // 面额 count: 100, // 面额
pic: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/a_re_item1.webp', pic: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/a_re_item5.webp',
num: 0, //购买的个数 num: 0, //购买的个数
}, },
{ {
count: 200, count: 200,
pic: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/a_re_item2.webp', pic: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/a_re_item6.webp',
num: 0, //购买的个数 num: 0, //购买的个数
}, },
{ {
count: 500, count: 500,
pic: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/a_re_item3.webp', pic: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/a_re_item7.webp',
num: 0, //购买的个数 num: 0, //购买的个数
}, },
{ {
count: 1000, count: 1000,
pic: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/a_re_item4.webp', pic: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/a_re_item8.webp',
num: 0, //购买的个数 num: 0, //购买的个数
} }
], ],
@ -136,19 +127,22 @@
recordList: [], recordList: [],
tipType: [ tipType: [
{ {
red1: '8%无门槛红包', red1: '5%的现金抵扣红包',
red2: '42%现金抵扣红包'
}, },
{ {
red1: '12%无门槛红包', red1: '10%的现金抵扣红包',
red2: '68%现金抵扣红包'
}, },
{ {
red1: '15%无门槛红包', red1: '15%的现金抵扣红包',
red2: '85%现金抵扣红包' },
{
red1: '20%的现金抵扣红包',
},
{
red1: '',
}, },
], ],
red_type: 0, red_type: 4,
where: { where: {
page: 1, page: 1,
limit: 15, limit: 15,
@ -222,30 +216,44 @@
changeItem(e, index) { changeItem(e, index) {
this.nowPrice = e; this.nowPrice = e;
this.nowChange = index; this.nowChange = index;
if (this.priceCount * this.nowPrice > 20000) { if (this.priceCount * this.nowPrice > 100000) {
this.priceCount = Math.floor(20000 / this.nowPrice); this.priceCount = Math.floor(100000 / this.nowPrice);
return Toast('不可超过2万元'); return Toast('不可超过10万元');
} }
}, },
append(item) { append(item) {
if(this.total + item.count >=2001 && this.total + item.count <=4000 && this.red_type != 1){ if(this.total + item.count >=0 && this.total + item.count <1000) this.red_type = 4;
else if(this.total + item.count >=1000 && this.total + item.count <=4999 && this.red_type != 0){
this.red_type = 0;
this.$refs.redTipsRef.open();
}else if(this.total + item.count >=5000 && this.total + item.count <=9999 && this.red_type != 1){
this.red_type = 1; this.red_type = 1;
this.$refs.redTipsRef.open(); this.$refs.redTipsRef.open();
}else if(this.total + item.count >=4001 && this.total + item.count <=20000 && this.red_type != 2){ }else if(this.total + item.count >=10000 && this.total + item.count <=49999 && this.red_type != 2){
this.red_type = 2; this.red_type = 2;
this.$refs.redTipsRef.open(); this.$refs.redTipsRef.open();
}else if(this.total + item.count >=50000 && this.total + item.count <=100000 && this.red_type != 3){
this.red_type = 3;
this.$refs.redTipsRef.open();
} }
if (this.total + item.count > 20000 || this.total>=20000) { if (this.total + item.count > 100000 || this.total>=100000) {
return Toast('不可超过2万元'); return Toast('不可超过10万元');
} else item.num++; } else item.num++;
}, },
reduce(item) { reduce(item) {
if(this.total - item.count >=100 && this.total - item.count <=2000 && this.red_type != 0){ if(this.total - item.count >=0 && this.total - item.count <1000) this.red_type = 4;
else if(this.total - item.count >=1000 && this.total - item.count <=4999 && this.red_type != 0){
this.red_type = 0; this.red_type = 0;
this.$refs.redTipsRef.open(); this.$refs.redTipsRef.open();
}else if(this.total - item.count >=2001 && this.total - item.count <=4000 && this.red_type != 1){ }else if(this.total - item.count >=5000 && this.total - item.count <=9999 && this.red_type != 1){
this.red_type = 1; this.red_type = 1;
this.$refs.redTipsRef.open(); this.$refs.redTipsRef.open();
}else if(this.total - item.count >=10000 && this.total - item.count <=49999 && this.red_type != 2){
this.red_type = 2;
this.$refs.redTipsRef.open();
}else if(this.total - item.count >=50000 && this.total - item.count <=100000 && this.red_type != 3){
this.red_type = 3;
this.$refs.redTipsRef.open();
} }
if (this.total==0||item.num==0) return Toast('不能再少啦'); if (this.total==0||item.num==0) return Toast('不能再少啦');
else item.num--; else item.num--;
@ -715,13 +723,14 @@
width: 700rpx; width: 700rpx;
margin: 0 auto; margin: 0 auto;
display: flex; display: flex;
flex-direction: column; justify-content: space-between;
flex-wrap: wrap;
.change_item { .change_item {
width: 700rpx; width: 335rpx;
height: 172rpx; height: 172rpx;
text-align: center; text-align: center;
background-color: #f7f7f7; // background-color: #f7f7f7;
border-radius: 20rpx 20rpx 20rpx 20rpx; border-radius: 20rpx 20rpx 20rpx 20rpx;
font-size: 40rpx; font-size: 40rpx;
position: relative; position: relative;
@ -741,16 +750,11 @@
left: 0; left: 0;
top: 0; top: 0;
width: 100%; width: 100%;
height: 100%; height: 172rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
.top{
display: flex;
justify-content: space-between;
align-items: center;
height: 70rpx;
.top_left{ .top_left{
font-size: 58rpx; font-size: 58rpx;
color: #ffc53d; color: #ffc53d;
@ -786,25 +790,7 @@
line-height: 60rpx; line-height: 60rpx;
} }
} }
}
.bottom{
font-size: 28rpx;
display: flex;
align-items: center;
color: #FF3A32;
.bottom_item{
flex: 1;
display: flex;
align-items: center;
image{
width: 32rpx;
height: 40rpx;
}
.text{
padding-left: 15rpx;
}
}
}
} }
} }
@ -820,6 +806,11 @@
} }
.a_tips{
color: #FF8056;
padding: 0 30rpx;
line-height: 40rpx;
}
} }

10
pages/users/login/login_copy.vue
View File

@ -188,9 +188,9 @@
<button form-type="submit" @click="auth_token = ''" class="confirmBnt back">返回</button> <button form-type="submit" @click="auth_token = ''" class="confirmBnt back">返回</button>
</view> </view>
</form> </form>
<view class="copyright" @click="goCopyUrl"> <!-- <view class="copyright" @click="goCopyUrl">
{{ copyright.status == -1 ? `${copyright.year} ${copyright.url}` : copyright.Copyright }} {{ copyright.status == -1 ? `${copyright.year} ${copyright.url}` : copyright.Copyright }}
</view> </view> -->
<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }" <Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
ref="verify"></Verify> ref="verify"></Verify>
@ -384,7 +384,7 @@
// #endif // #endif
goCopyUrl() { goCopyUrl() {
// #ifdef H5 // #ifdef H5
location.href = 'http://' + this.copyright.url // location.href = 'http://' + this.copyright.url
// #endif // #endif
}, },
userAgree() { userAgree() {
@ -1290,14 +1290,14 @@
} }
.copyright { .copyright {
position: fixed; position: absolute;
bottom: 30rpx; bottom: 30rpx;
left: 0; left: 0;
width: 100%; width: 100%;
text-align: center; text-align: center;
font-size: 20rpx; font-size: 20rpx;
line-height: 28rpx; line-height: 28rpx;
color: #FFFFFF; color: #ccc;
.cell { .cell {
// margin-left: 6rpx; // margin-left: 6rpx;

11
pages/users/order_confirm/index.vue
View File

@ -36,18 +36,19 @@
<view v-if="goods.product_type == 2"> <view v-if="goods.product_type == 2">
<view class="product-item"> <view class="product-item">
<view class="img-box"> <view class="img-box">
<image :src="goods.productPresellAttr.image || goods.product.image"></image> <image :src="(goods.productPresellAttr&&goods.productPresellAttr.image) || (goods.product&&goods.product.image)"></image>
</view> </view>
<view class="content event_content"> <view class="content event_content">
<view class="name line1"><text <view class="name line1">
class="event_name event_bg">预售</text>{{goods.productPresell.store_name}} <!-- <text class="event_name event_bg">预售</text> -->
{{goods.productPresell.store_name}}
</view> </view>
<view class="label" style="width: 70%;">{{goods.productAttr.sku}}</view> <view class="label" style="width: 70%;">{{goods.productAttr.sku}}</view>
<view class="price"> <view class="price" v-if="goods.productPresellAttr">
￥{{goods.productPresellAttr.presell_price}} ￥{{goods.productPresellAttr.presell_price}}
<text>X{{goods.cart_num}}</text> <text>X{{goods.cart_num}}</text>
</view> </view>
<view class="event_ship event_color">发货时间： <view class="event_ship event_color" v-if="false">发货时间：
<!--全款预售--> <!--全款预售-->
<text <text
v-if="goods.productPresell.presell_type === 1">{{goods.productPresell.delivery_type === 1 ? '支付后' : '预售结束后'}}{{ goods.productPresell.delivery_day }}天内</text> v-if="goods.productPresell.presell_type === 1">{{goods.productPresell.delivery_type === 1 ? '支付后' : '预售结束后'}}{{ goods.productPresell.delivery_day }}天内</text>

2
pages/users/user_info/index.vue
View File

@ -135,7 +135,7 @@
<!--#endif--> <!--#endif-->
</view> </view>
<!-- #ifdef H5 --> <!-- #ifdef H5 -->
<view class="logOut acea-row row-center-wrapper" @click="outLogin" v-if="!this.$wechat.isWeixin()">退出登录</view> <view class="logOut acea-row row-center-wrapper" @click="outLogin">退出登录</view>
<!-- #endif --> <!-- #endif -->
<!-- #ifdef MP || APP-PLUS --> <!-- #ifdef MP || APP-PLUS -->
<view class="logOut acea-row row-center-wrapper" @click="outLogin">退出登录</view> <view class="logOut acea-row row-center-wrapper" @click="outLogin">退出登录</view>