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

4 years ago · eb8bcae3f0
20 changed files with 36 additions and 28 deletions
--- a/common/js/sandBox.js
+++ b/common/js/sandBox.js
@ -1,6 +1,6 @@
 import config from './config';
 var gbConfig = {
-    appid: 'wx43759fe438b7b066'
+    appid: 'wxe8e0c0bbe67c5cb8'
 };
 /*获取当前页带参数的url*/
 function getCurrentPageUrlWithArgs(){
--- a/components/lf-indexFind/lf-indexFind.vue
+++ b/components/lf-indexFind/lf-indexFind.vue
@ -90,6 +90,8 @@
 			background: #FFFFFF;
 			box-shadow: 0rpx 2rpx 8rpx 1rpx rgba(0, 0, 0, 0.1);
 			margin-right: 20rpx;
+			overflow: hidden;
+			border-radius: 20rpx;
 			.img{
 				width: 380rpx;
 				height: 380rpx;
--- a/components/lf-indexShopMatrix/lf-indexShopMatrix.vue
+++ b/components/lf-indexShopMatrix/lf-indexShopMatrix.vue
@ -66,6 +66,8 @@
 				border: 1rpx solid #979797;
 				margin-right: 9rpx;
 				position: relative;
+				overflow: hidden;
+				border-radius: 5rpx;
 				&:nth-child(4n){
 					margin-right: 0rpx;
 				}
--- a/components/lf-multiColumnAd/lf-multiColumnAd.vue
+++ b/components/lf-multiColumnAd/lf-multiColumnAd.vue
@ -50,6 +50,7 @@
 				width: 228rpx;
 				height: 208rpx;
 				background: #D8D8D8;
+				overflow: hidden;
 				&:nth-child(1n){
 					border-radius: 0rpx 20rpx 0rpx 0rpx;
 				}
--- a/components/lf-seckill/lf-seckill.vue
+++ b/components/lf-seckill/lf-seckill.vue
@ -10,8 +10,8 @@
 						<image class="goods-img" :src="item.associate.goods.img"></image>
 						<view class="lf-line-1 goods-title">{{ item.associate.goods.name }}</view>
 						<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>
--- a/components/lf-shopGoodsCard/lf-shopGoodsCard.vue
+++ b/components/lf-shopGoodsCard/lf-shopGoodsCard.vue
@ -63,6 +63,7 @@
 			.img{
 				width: 100%;
 				height: 100%;
+				border-radius: 20rpx 20rpx 0rpx 0rpx;
 			}
 		}
 		.scroll-view{
--- a/manifest.json
+++ b/manifest.json
@ -117,7 +117,7 @@
    "quickapp" : {},
    /* 小程序特有相关 */
    "mp-weixin" : {
-        "appid" : "wxb35ef055a4dd8ad4",
+        "appid" : "wxe8e0c0bbe67c5cb8",
        "setting" : {
            "urlCheck" : false,
            "postcss" : true
--- a/pages/address/add/add.vue
+++ b/pages/address/add/add.vue
@ -383,13 +383,13 @@ export default {
          } else {
            wx.showToast({
              title: res.message,
-              image: '../../../static/error.png'
+              icon: 'error'
            });
          }
        } else {
          wx.showToast({
            title: '获取信息失败',
-            image: '../../../static/error.png'
+            icon: 'error'
          });
        }
 		uni.hideLoading();
@ -436,7 +436,7 @@ export default {
          } else {
            wx.showToast({
              title: '新增收货地址失败',
-              image: '../../../static/error.png',
+              icon: 'error',
              complete: err => {
                setTimeout(() => {
                  wx.navigateBack();
@ -447,7 +447,7 @@ export default {
        } else {
          wx.showToast({
            title: '请求错误',
-            image: '../../../static/error.png',
+            icon: 'error',
            complete: err => {
              setTimeout(() => {
                wx.navigateBack();
@ -506,7 +506,7 @@ export default {
          } else {
            wx.showToast({
              title: '修改收货地址失败',
-              image: '../../../static/error.png',
+              icon: 'error',
              complete: err => {
                setTimeout(() => {
                  wx.navigateBack();
@ -552,7 +552,7 @@ export default {
          } else {
            wx.showToast({
              title: '删除收货地址失败',
-              image: '../../../static/error.png',
+              icon: 'error',
              complete: err => {
                setTimeout(() => {
                  wx.navigateBack();
@ -563,7 +563,7 @@ export default {
        } else {
          wx.showToast({
            title: '请求错误',
-            image: '../../../static/error.png',
+            icon: 'error',
            complete: err => {
              setTimeout(() => {
                wx.navigateBack();
--- a/pages/address/list/list.vue
+++ b/pages/address/list/list.vue
@ -225,13 +225,13 @@ export default {
          } else {
            wx.showToast({
              title: res.message,
-              image: '../../../static/error.png'
+              icon: 'error'
            });
          }
        } else {
          wx.showToast({
            title: '获取信息失败',
-            image: '../../../static/error.png'
+            icon: 'error'
          });
        }
 		this.is_load = false;
--- a/pages/coupon/index/index1.vue
+++ b/pages/coupon/index/index1.vue
@ -229,7 +229,7 @@
                this.queryCouponList(status, page);
            } else {
                wx.showToast({
-                    image: '../../../static/error.png',
+                    icon: 'error',
                    title: '再拉也没有啦'
                });
            }
--- a/pages/index/category/category.vue
+++ b/pages/index/category/category.vue
@ -535,7 +535,7 @@
 		.img{
 			width: 150rpx;
 			height: 150rpx;
-			border-radius: 4rpx;
+			border-radius: 5rpx;
 			margin-right: 20rpx;
 		}
 		.info{
--- a/pages/index/index/index.vue
+++ b/pages/index/index/index.vue
@ -681,21 +681,21 @@
                        } else {
                            wx.showToast({
                                title: res.message || '领取失败',
-                                image: '../../../static/error.png'
+                                icon: 'error'
                            });
                        }
 						wx.hideLoading();
                    } else {
                        wx.showToast({
                            title: '领取失败',
-                            image: '../../../static/error.png'
+                            icon: 'error'
                        });
 						wx.hideLoading();
                    }
                }).catch(rej => {
                    wx.showToast({
                        title: '领取失败',
-                        image: '../../../static/error.png'
+                        icon: 'error'
                    });
                    wx.hideLoading();
                });
--- a/pages/point/shoppingMall/shoppingMall.vue
+++ b/pages/point/shoppingMall/shoppingMall.vue
@ -6,7 +6,7 @@
 		</view>
 		<view class="menu">
 			<view class="left">
-				<view>
+				<view @click="$url('/pages/point/detail/detail')">
 					<text class="lf-iconfont icon-jifen"></text>
 					<text class="point-num">{{ point.point }}</text>
 					<text class="lf-iconfont icon-xiangyou lf-font-24"></text>
--- a/pages/recharge/balance/balance
+++ b/pages/recharge/balance/balance
@ -112,7 +112,7 @@ export default {
      this.queryBalanceList(token, status, page);
    } else {
      wx.showToast({
-        image: '../../../static/error.png',
+        icon: 'error',
        title: '再拉也没有啦'
      });
    }
--- a/pages/recharge/balance/balance.vue
+++ b/pages/recharge/balance/balance.vue
@ -231,7 +231,7 @@
 		    // this.queryBalanceList(token, status, page);
 		  } else {
 		    wx.showToast({
-		      image: '../../../static/error.png',
+		      icon: 'error',
 		      title: '再拉也没有啦'
 		    });
 		  }
--- a/pages/shop/goodsdetail.vue
+++ b/pages/shop/goodsdetail.vue
@ -45,6 +45,7 @@
 							<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>
 						</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>
 						<text class="lf-iconfont icon-fenxiang lf-font-40" @click="shareGraphic()"></text>
 					</view>
--- a/pages/shop/seckillList.vue
+++ b/pages/shop/seckillList.vue
@ -67,7 +67,7 @@
 						<view class="lf-row-between">
 							<view class="price">
 								<text>¥{{ item.seckill_price }}</text>
-								<text>¥{{ item.goods.market_price }}</text>
+								<text>¥{{ item.goods.sell_price }}</text>
 							</view>
 							<view class="btn" hover-class="lf-opacity">立即秒杀</view>
 						</view>
--- a/pages/shop/shopdetail.vue
+++ b/pages/shop/shopdetail.vue
@ -376,6 +376,7 @@
 		width: 90rpx;
 		height: 90rpx;
 		margin-right: 15rpx;
+		border-radius: 5rpx;
 	}
 	.shop-function {
 		width: 80rpx;
--- a/pages/store/cart/carttemplate.vue
+++ b/pages/store/cart/carttemplate.vue
@ -534,7 +534,7 @@ export default {
        item.total = item.qty * Number(item.price);
        wx.showToast({
          title: '超过最大库存',
-          image: '../../../static/error.png'
+          icon: 'error'
        });
      }

@ -654,7 +654,7 @@ export default {
        } else {
          wx.showToast({
            title: '超过最大库存',
-            image: '../../../static/error.png'
+            icon: 'error'
          });
        }
      }
@ -771,7 +771,7 @@ export default {
      } else {
        wx.showToast({
          title: '删除购物车商品失败！',
-          image: '../../../static/error.png'
+          icon: 'error'
        });
      }
    },
@ -866,13 +866,13 @@ export default {
          } else {
            wx.showToast({
              title: res.message,
-              image: '../../../static/error.png'
+              icon: 'error'
            });
          }
        } else {
          wx.showToast({
            title: '领取失败',
-            image: '../../../static/error.png'
+            icon: 'error'
          });
        }
      });
--- a/pages/user/register/register
+++ b/pages/user/register/register
@ -390,7 +390,7 @@
 						} else {
 							wx.showToast({
 								title: '获取code失败',
-								image: '../../../static/error.png'
+								icon: 'error'
 							});
 						}
 					},