From 143735a5b02207e4481955bb9024d8d724d7de8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Mon, 28 Jun 2021 14:23:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/api.js | 1 +
common/styles/iconfont.css | 10 +++++++---
pages/center/index.vue | 4 ++--
pages/collect/index.vue | 6 +++---
pages/goodsDetail/index.vue | 32 +++++++++++++++++---------------
pages/index/index.vue | 10 +++++++---
pages/login/index.vue | 12 ++++++------
pages/route/index.vue | 6 ++++++
static/center/shop-logo.png | Bin 0 -> 3014 bytes
static/tabbar/home-active.png | Bin 2372 -> 1910 bytes
static/tabbar/home.png | Bin 2332 -> 1842 bytes
static/tabbar/my-active.png | Bin 2818 -> 2397 bytes
static/tabbar/my.png | Bin 2677 -> 2304 bytes
static/tabbar/order-active.png | Bin 1842 -> 1648 bytes
static/tabbar/order.png | Bin 1757 -> 1530 bytes
15 files changed, 49 insertions(+), 32 deletions(-)
create mode 100644 static/center/shop-logo.png
diff --git a/common/api.js b/common/api.js
index da0e151..9b2a59a 100644
--- a/common/api.js
+++ b/common/api.js
@@ -2,6 +2,7 @@
export const DEV = "dev"; // dev 测试 | prod 正式
export const VERSION = '1.0.0'; // 版本号
export const DEVURL = 'http://gxsky.lanzulive.com'; // 测试服请求地址
+// export const DEVURL = 'http://192.168.3.8'; // 测试服请求地址, 韦港电脑
export const PRODURL = ''; // 正式服请求地址
/* 首页相关接口 */
diff --git a/common/styles/iconfont.css b/common/styles/iconfont.css
index bd0a103..80b36c6 100644
--- a/common/styles/iconfont.css
+++ b/common/styles/iconfont.css
@@ -1,8 +1,8 @@
@font-face {
font-family: "lf-iconfont"; /* Project id 2631569 */
- src: url('//at.alicdn.com/t/font_2631569_rgieivs47oc.woff2?t=1624527625328') format('woff2'),
- url('//at.alicdn.com/t/font_2631569_rgieivs47oc.woff?t=1624527625328') format('woff'),
- url('//at.alicdn.com/t/font_2631569_rgieivs47oc.ttf?t=1624527625328') format('truetype');
+ src: url('//at.alicdn.com/t/font_2631569_oxrildtg1f.woff2?t=1624852913594') format('woff2'),
+ url('//at.alicdn.com/t/font_2631569_oxrildtg1f.woff?t=1624852913594') format('woff'),
+ url('//at.alicdn.com/t/font_2631569_oxrildtg1f.ttf?t=1624852913594') format('truetype');
}
.lf-iconfont {
@@ -13,6 +13,10 @@
-moz-osx-font-smoothing: grayscale;
}
+.lf-icon-weixin:before {
+ content: "\f262";
+}
+
.lf-icon-jia1:before {
content: "\e6d4";
}
diff --git a/pages/center/index.vue b/pages/center/index.vue
index 6646d1c..7364e55 100644
--- a/pages/center/index.vue
+++ b/pages/center/index.vue
@@ -158,7 +158,7 @@
if(result.errMsg == 'scanCode:ok'){
let content = result.result; // 核销码
this.$http(this.API.API_CONFIRM_CODE, {confirm_code: content}).then(res => {
- this.$msg(res.msg);
+ this.$msg(res.msg, {icon: 'success'});
});
}
}
@@ -172,7 +172,7 @@
success: result => {
console.log(result);
if(result.confirm){
- uni.setStorageSync('quit_login_state', true);
+ // uni.setStorageSync('quit_login_state', true);
uni.removeStorageSync('userinfo');
this.$msg('退出成功', {icon: 'success'});
}
diff --git a/pages/collect/index.vue b/pages/collect/index.vue
index c92a556..ff79c9d 100644
--- a/pages/collect/index.vue
+++ b/pages/collect/index.vue
@@ -7,10 +7,11 @@
{{ item.goods.name }}
-
+
+
{{ item.goods.store.name }}
-
+
@@ -110,7 +111,6 @@
width: 60rpx;
height: 60rpx;
border-radius: 10rpx;
- background-color: #EEEEEE;
}
.shop-name{
width: 340rpx;
diff --git a/pages/goodsDetail/index.vue b/pages/goodsDetail/index.vue
index 31ece93..fdfb5e7 100644
--- a/pages/goodsDetail/index.vue
+++ b/pages/goodsDetail/index.vue
@@ -13,7 +13,10 @@
{{ goods_detail.name }}
- ¥{{ goods_detail.specs[0].selling_price }}
+
+ ¥
+ {{ goods_detail.specs[0].selling_price }}
+
¥{{ goods_detail.specs[0].original_price }}
{{ goods_detail.specs[0].cost }}
@@ -31,7 +34,8 @@
适用门店
-
+
+
{{ goods_detail.store.name }}
@@ -39,7 +43,6 @@
-
@@ -49,7 +52,8 @@
商品详情
-
+
+
@@ -57,27 +61,19 @@
-
首页
-
客服
-
{{ is_collect ? '已收藏' : '收藏' }}
@@ -89,6 +85,8 @@