Leadfyy.co
/
ec.uniapp-master
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/ec.uniapp-master

master
Enzo 4 years ago
parent
3764d2584f 15a2e01790
commit
eb8bcae3f0
20 changed files with 36 additions and 28 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. 2
      common/js/sandBox.js
  2. 2
      components/lf-indexFind/lf-indexFind.vue
  3. 2
      components/lf-indexShopMatrix/lf-indexShopMatrix.vue
  4. 1
      components/lf-multiColumnAd/lf-multiColumnAd.vue
  5. 4
      components/lf-seckill/lf-seckill.vue
  6. 1
      components/lf-shopGoodsCard/lf-shopGoodsCard.vue
  7. 2
      manifest.json
  8. 14
      pages/address/add/add.vue
  9. 4
      pages/address/list/list.vue
  10. 2
      pages/coupon/index/index1.vue
  11. 2
      pages/index/category/category.vue
  12. 6
      pages/index/index/index.vue
  13. 2
      pages/point/shoppingMall/shoppingMall.vue
  14. 2
      pages/recharge/balance/balance - 副本.vue
  15. 2
      pages/recharge/balance/balance.vue
  16. 1
      pages/shop/goodsdetail.vue
  17. 2
      pages/shop/seckillList.vue
  18. 1
      pages/shop/shopdetail.vue
  19. 10
      pages/store/cart/carttemplate.vue
  20. 2
      pages/user/register/register - 副本.vue

2
common/js/sandBox.js
View File

@ -1,6 +1,6 @@
import config from './config'; import config from './config';
var gbConfig = { var gbConfig = {
appid: 'wx43759fe438b7b066'
appid: 'wxe8e0c0bbe67c5cb8'
}; };
/*获取当前页带参数的url*/ /*获取当前页带参数的url*/
function getCurrentPageUrlWithArgs(){ function getCurrentPageUrlWithArgs(){

2
components/lf-indexFind/lf-indexFind.vue
View File

@ -90,6 +90,8 @@
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0rpx 2rpx 8rpx 1rpx rgba(0, 0, 0, 0.1); box-shadow: 0rpx 2rpx 8rpx 1rpx rgba(0, 0, 0, 0.1);
margin-right: 20rpx; margin-right: 20rpx;
overflow: hidden;
border-radius: 20rpx;
.img{ .img{
width: 380rpx; width: 380rpx;
height: 380rpx; height: 380rpx;

2
components/lf-indexShopMatrix/lf-indexShopMatrix.vue
View File

@ -66,6 +66,8 @@
border: 1rpx solid #979797; border: 1rpx solid #979797;
margin-right: 9rpx; margin-right: 9rpx;
position: relative; position: relative;
overflow: hidden;
border-radius: 5rpx;
&:nth-child(4n){ &:nth-child(4n){
margin-right: 0rpx; margin-right: 0rpx;
} }

1
components/lf-multiColumnAd/lf-multiColumnAd.vue
View File

@ -50,6 +50,7 @@
width: 228rpx; width: 228rpx;
height: 208rpx; height: 208rpx;
background: #D8D8D8; background: #D8D8D8;
overflow: hidden;
&:nth-child(1n){ &:nth-child(1n){
border-radius: 0rpx 20rpx 0rpx 0rpx; border-radius: 0rpx 20rpx 0rpx 0rpx;
} }

4
components/lf-seckill/lf-seckill.vue
View File

@ -10,8 +10,8 @@
<image class="goods-img" :src="item.associate.goods.img"></image> <image class="goods-img" :src="item.associate.goods.img"></image>
<view class="lf-line-1 goods-title">{{ item.associate.goods.name }}</view> <view class="lf-line-1 goods-title">{{ item.associate.goods.name }}</view>
<view class="goods-price"> <view class="goods-price">
<text>¥{{ item.associate.goods.market_price }}</text>
<text>¥{{ item.associate.goods.max_price }}</text>
<text>¥{{ item.associate.seckill_price }}</text>
<text>¥{{ item.associate.goods.sell_price }}</text>
</view> </view>
</view> </view>
</view> </view>

1
components/lf-shopGoodsCard/lf-shopGoodsCard.vue
View File

@ -63,6 +63,7 @@
.img{ .img{
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 20rpx 20rpx 0rpx 0rpx;
} }
} }
.scroll-view{ .scroll-view{

2
manifest.json
View File

@ -117,7 +117,7 @@
"quickapp" : {}, "quickapp" : {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin" : { "mp-weixin" : {
"appid" : "wxb35ef055a4dd8ad4",
"appid" : "wxe8e0c0bbe67c5cb8",
"setting" : { "setting" : {
"urlCheck" : false, "urlCheck" : false,
"postcss" : true "postcss" : true

14
pages/address/add/add.vue
View File

@ -383,13 +383,13 @@ export default {
} else { } else {
wx.showToast({ wx.showToast({
title: res.message, title: res.message,
image: '../../../static/error.png'
icon: 'error'
}); });
} }
} else { } else {
wx.showToast({ wx.showToast({
title: '获取信息失败', title: '获取信息失败',
image: '../../../static/error.png'
icon: 'error'
}); });
} }
uni.hideLoading(); uni.hideLoading();
@ -436,7 +436,7 @@ export default {
} else { } else {
wx.showToast({ wx.showToast({
title: '新增收货地址失败', title: '新增收货地址失败',
image: '../../../static/error.png',
icon: 'error',
complete: err => { complete: err => {
setTimeout(() => { setTimeout(() => {
wx.navigateBack(); wx.navigateBack();
@ -447,7 +447,7 @@ export default {
} else { } else {
wx.showToast({ wx.showToast({
title: '请求错误', title: '请求错误',
image: '../../../static/error.png',
icon: 'error',
complete: err => { complete: err => {
setTimeout(() => { setTimeout(() => {
wx.navigateBack(); wx.navigateBack();
@ -506,7 +506,7 @@ export default {
} else { } else {
wx.showToast({ wx.showToast({
title: '修改收货地址失败', title: '修改收货地址失败',
image: '../../../static/error.png',
icon: 'error',
complete: err => { complete: err => {
setTimeout(() => { setTimeout(() => {
wx.navigateBack(); wx.navigateBack();
@ -552,7 +552,7 @@ export default {
} else { } else {
wx.showToast({ wx.showToast({
title: '删除收货地址失败', title: '删除收货地址失败',
image: '../../../static/error.png',
icon: 'error',
complete: err => { complete: err => {
setTimeout(() => { setTimeout(() => {
wx.navigateBack(); wx.navigateBack();
@ -563,7 +563,7 @@ export default {
} else { } else {
wx.showToast({ wx.showToast({
title: '请求错误', title: '请求错误',
image: '../../../static/error.png',
icon: 'error',
complete: err => { complete: err => {
setTimeout(() => { setTimeout(() => {
wx.navigateBack(); wx.navigateBack();

4
pages/address/list/list.vue
View File

@ -225,13 +225,13 @@ export default {
} else { } else {
wx.showToast({ wx.showToast({
title: res.message, title: res.message,
image: '../../../static/error.png'
icon: 'error'
}); });
} }
} else { } else {
wx.showToast({ wx.showToast({
title: '获取信息失败', title: '获取信息失败',
image: '../../../static/error.png'
icon: 'error'
}); });
} }
this.is_load = false; this.is_load = false;

2
pages/coupon/index/index1.vue
View File

@ -229,7 +229,7 @@
this.queryCouponList(status, page); this.queryCouponList(status, page);
} else { } else {
wx.showToast({ wx.showToast({
image: '../../../static/error.png',
icon: 'error',
title: '再拉也没有啦' title: '再拉也没有啦'
}); });
} }

2
pages/index/category/category.vue
View File

@ -535,7 +535,7 @@
.img{ .img{
width: 150rpx; width: 150rpx;
height: 150rpx; height: 150rpx;
border-radius: 4rpx;
border-radius: 5rpx;
margin-right: 20rpx; margin-right: 20rpx;
} }
.info{ .info{

6
pages/index/index/index.vue
View File

@ -681,21 +681,21 @@
} else { } else {
wx.showToast({ wx.showToast({
title: res.message || '领取失败', title: res.message || '领取失败',
image: '../../../static/error.png'
icon: 'error'
}); });
} }
wx.hideLoading(); wx.hideLoading();
} else { } else {
wx.showToast({ wx.showToast({
title: '领取失败', title: '领取失败',
image: '../../../static/error.png'
icon: 'error'
}); });
wx.hideLoading(); wx.hideLoading();
} }
}).catch(rej => { }).catch(rej => {
wx.showToast({ wx.showToast({
title: '领取失败', title: '领取失败',
image: '../../../static/error.png'
icon: 'error'
}); });
wx.hideLoading(); wx.hideLoading();
}); });

2
pages/point/shoppingMall/shoppingMall.vue
View File

@ -6,7 +6,7 @@
</view> </view>
<view class="menu"> <view class="menu">
<view class="left"> <view class="left">
<view>
<view @click="$url('/pages/point/detail/detail')">
<text class="lf-iconfont icon-jifen"></text> <text class="lf-iconfont icon-jifen"></text>
<text class="point-num">{{ point.point }}</text> <text class="point-num">{{ point.point }}</text>
<text class="lf-iconfont icon-xiangyou lf-font-24"></text> <text class="lf-iconfont icon-xiangyou lf-font-24"></text>

2
pages/recharge/balance/balance - 副本.vue
View File

@ -112,7 +112,7 @@ export default {
this.queryBalanceList(token, status, page); this.queryBalanceList(token, status, page);
} else { } else {
wx.showToast({ wx.showToast({
image: '../../../static/error.png',
icon: 'error',
title: '再拉也没有啦' title: '再拉也没有啦'
}); });
} }

2
pages/recharge/balance/balance.vue
View File

@ -231,7 +231,7 @@
// this.queryBalanceList(token, status, page); // this.queryBalanceList(token, status, page);
} else { } else {
wx.showToast({ wx.showToast({
image: '../../../static/error.png',
icon: 'error',
title: '再拉也没有啦' title: '再拉也没有啦'
}); });
} }

1
pages/shop/goodsdetail.vue
View File

@ -45,6 +45,7 @@
<text class="lf-font-48 lf-color-primary lf-font-bold">{{ goods_detail.redeem_point }}</text> <text class="lf-font-48 lf-color-primary lf-font-bold">{{ goods_detail.redeem_point }}</text>
<text class="lf-font-28 lf-color-777 lf-m-l-10">个积分兑换</text> <text class="lf-font-28 lf-color-777 lf-m-l-10">个积分兑换</text>
</view> </view>
<lf-price :iftext="false" :price="seckill.seckill_price || 0" v-else-if="type == 'seckill'"></lf-price>
<lf-price :iftext="false" :price="goods_detail.sell_price || 0" v-else></lf-price> <lf-price :iftext="false" :price="goods_detail.sell_price || 0" v-else></lf-price>
<text class="lf-iconfont icon-fenxiang lf-font-40" @click="shareGraphic()"></text> <text class="lf-iconfont icon-fenxiang lf-font-40" @click="shareGraphic()"></text>
</view> </view>

2
pages/shop/seckillList.vue
View File

@ -67,7 +67,7 @@
<view class="lf-row-between"> <view class="lf-row-between">
<view class="price"> <view class="price">
<text>¥{{ item.seckill_price }}</text> <text>¥{{ item.seckill_price }}</text>
<text>¥{{ item.goods.market_price }}</text>
<text>¥{{ item.goods.sell_price }}</text>
</view> </view>
<view class="btn" hover-class="lf-opacity">立即秒杀</view> <view class="btn" hover-class="lf-opacity">立即秒杀</view>
</view> </view>

1
pages/shop/shopdetail.vue
View File

@ -376,6 +376,7 @@
width: 90rpx; width: 90rpx;
height: 90rpx; height: 90rpx;
margin-right: 15rpx; margin-right: 15rpx;
border-radius: 5rpx;
} }
.shop-function { .shop-function {
width: 80rpx; width: 80rpx;

10
pages/store/cart/carttemplate.vue
View File

@ -534,7 +534,7 @@ export default {
item.total = item.qty * Number(item.price); item.total = item.qty * Number(item.price);
wx.showToast({ wx.showToast({
title: '超过最大库存', title: '超过最大库存',
image: '../../../static/error.png'
icon: 'error'
}); });
} }
@ -654,7 +654,7 @@ export default {
} else { } else {
wx.showToast({ wx.showToast({
title: '超过最大库存', title: '超过最大库存',
image: '../../../static/error.png'
icon: 'error'
}); });
} }
} }
@ -771,7 +771,7 @@ export default {
} else { } else {
wx.showToast({ wx.showToast({
title: '删除购物车商品失败！', title: '删除购物车商品失败！',
image: '../../../static/error.png'
icon: 'error'
}); });
} }
}, },
@ -866,13 +866,13 @@ export default {
} else { } else {
wx.showToast({ wx.showToast({
title: res.message, title: res.message,
image: '../../../static/error.png'
icon: 'error'
}); });
} }
} else { } else {
wx.showToast({ wx.showToast({
title: '领取失败', title: '领取失败',
image: '../../../static/error.png'
icon: 'error'
}); });
} }
}); });

2
pages/user/register/register - 副本.vue
View File

@ -390,7 +390,7 @@
} else { } else {
wx.showToast({ wx.showToast({
title: '获取code失败', title: '获取code失败',
image: '../../../static/error.png'
icon: 'error'
}); });
} }
}, },

Write Preview
Loading…
Cancel
Save