From f0244f807776ec8c01a4a15c56bacbd532fa4da3 Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Thu, 18 Jun 2020 14:57:26 +0800
Subject: [PATCH] 6.18
---
common/api/shop.js | 9 ++-
common/api/user.js | 6 --
components/remaining/remaining.vue | 94 ++++++++++++++++------------
components/shop/list/index.vue | 20 +++---
components/shop/list/item.vue | 14 +++--
components/shop/shop-item/index.vue | 7 ++-
pageA/login/login.vue | 6 ++
pageA/register/register.vue | 10 +--
pageA/topick/topick.vue | 7 ++-
pageE/more/WriteComments.vue | 5 +-
pages.json | 28 ++++-----
pages/index/index.vue | 9 ++-
pages/mine/index.vue | 6 +-
pages/shop/index.vue | 87 +++++++++++++++++--------
static/fonts/customer.ttf | Bin 0 -> 1884 bytes
static/fonts/setting.ttf | Bin 0 -> 2108 bytes
static/image/emoji/1.gif | Bin 0 -> 1993 bytes
static/image/emoji/10.gif | Bin 0 -> 1872 bytes
static/image/emoji/11.gif | Bin 0 -> 779 bytes
static/image/emoji/12.gif | Bin 0 -> 1883 bytes
static/image/emoji/13.gif | Bin 0 -> 1860 bytes
static/image/emoji/14.gif | Bin 0 -> 830 bytes
static/image/emoji/15.gif | Bin 0 -> 2007 bytes
static/image/emoji/16.gif | Bin 0 -> 1879 bytes
static/image/emoji/17.gif | Bin 0 -> 1870 bytes
static/image/emoji/18.gif | Bin 0 -> 1880 bytes
static/image/emoji/19.gif | Bin 0 -> 1887 bytes
static/image/emoji/2.gif | Bin 0 -> 1959 bytes
static/image/emoji/20.gif | Bin 0 -> 1863 bytes
static/image/emoji/21.gif | Bin 0 -> 1889 bytes
static/image/emoji/22.gif | Bin 0 -> 2018 bytes
static/image/emoji/23.gif | Bin 0 -> 1240 bytes
static/image/emoji/24.gif | Bin 0 -> 2035 bytes
static/image/emoji/25.gif | Bin 0 -> 1856 bytes
static/image/emoji/26.gif | Bin 0 -> 1876 bytes
static/image/emoji/27.gif | Bin 0 -> 1866 bytes
static/image/emoji/28.gif | Bin 0 -> 1864 bytes
static/image/emoji/29.gif | Bin 0 -> 822 bytes
static/image/emoji/3.gif | Bin 0 -> 1865 bytes
static/image/emoji/30.gif | Bin 0 -> 1869 bytes
static/image/emoji/31.gif | Bin 0 -> 1928 bytes
static/image/emoji/32.gif | Bin 0 -> 1876 bytes
static/image/emoji/33.gif | Bin 0 -> 1874 bytes
static/image/emoji/34.gif | Bin 0 -> 1231 bytes
static/image/emoji/35.gif | Bin 0 -> 1950 bytes
static/image/emoji/36.gif | Bin 0 -> 1851 bytes
static/image/emoji/37.gif | Bin 0 -> 843 bytes
static/image/emoji/38.gif | Bin 0 -> 1875 bytes
static/image/emoji/39.gif | Bin 0 -> 2239 bytes
static/image/emoji/4.gif | Bin 0 -> 1870 bytes
static/image/emoji/40.gif | Bin 0 -> 1251 bytes
static/image/emoji/41.gif | Bin 0 -> 1245 bytes
static/image/emoji/42.gif | Bin 0 -> 1873 bytes
static/image/emoji/43.gif | Bin 0 -> 1880 bytes
static/image/emoji/44.gif | Bin 0 -> 1897 bytes
static/image/emoji/45.gif | Bin 0 -> 817 bytes
static/image/emoji/46.gif | Bin 0 -> 844 bytes
static/image/emoji/47.gif | Bin 0 -> 2177 bytes
static/image/emoji/48.gif | Bin 0 -> 1864 bytes
static/image/emoji/49.gif | Bin 0 -> 1948 bytes
static/image/emoji/5.gif | Bin 0 -> 1833 bytes
static/image/emoji/50.gif | Bin 0 -> 1257 bytes
static/image/emoji/51.gif | Bin 0 -> 822 bytes
static/image/emoji/52.gif | Bin 0 -> 1795 bytes
static/image/emoji/53.gif | Bin 0 -> 1833 bytes
static/image/emoji/54.gif | Bin 0 -> 1835 bytes
static/image/emoji/55.gif | Bin 0 -> 1795 bytes
static/image/emoji/56.gif | Bin 0 -> 1836 bytes
static/image/emoji/57.gif | Bin 0 -> 650 bytes
static/image/emoji/58.gif | Bin 0 -> 1867 bytes
static/image/emoji/59.gif | Bin 0 -> 1808 bytes
static/image/emoji/6.gif | Bin 0 -> 1891 bytes
static/image/emoji/60.gif | Bin 0 -> 815 bytes
static/image/emoji/61.gif | Bin 0 -> 1136 bytes
static/image/emoji/62.gif | Bin 0 -> 1159 bytes
static/image/emoji/63.gif | Bin 0 -> 719 bytes
static/image/emoji/64.gif | Bin 0 -> 727 bytes
static/image/emoji/65.gif | Bin 0 -> 758 bytes
static/image/emoji/66.gif | Bin 0 -> 753 bytes
static/image/emoji/67.gif | Bin 0 -> 753 bytes
static/image/emoji/68.gif | Bin 0 -> 1762 bytes
static/image/emoji/69.gif | Bin 0 -> 1853 bytes
static/image/emoji/7.gif | Bin 0 -> 1867 bytes
static/image/emoji/70.gif | Bin 0 -> 1120 bytes
static/image/emoji/71.gif | Bin 0 -> 1629 bytes
static/image/emoji/72.gif | Bin 0 -> 1646 bytes
static/image/emoji/73.gif | Bin 0 -> 658 bytes
static/image/emoji/74.gif | Bin 0 -> 1122 bytes
static/image/emoji/75.gif | Bin 0 -> 654 bytes
static/image/emoji/76.gif | Bin 0 -> 1922 bytes
static/image/emoji/77.gif | Bin 0 -> 1957 bytes
static/image/emoji/78.gif | Bin 0 -> 1901 bytes
static/image/emoji/79.gif | Bin 0 -> 1933 bytes
static/image/emoji/8.gif | Bin 0 -> 1888 bytes
static/image/emoji/80.gif | Bin 0 -> 1937 bytes
static/image/emoji/81.gif | Bin 0 -> 1934 bytes
static/image/emoji/82.gif | Bin 0 -> 1902 bytes
static/image/emoji/9.gif | Bin 0 -> 1876 bytes
static/image/shop/1.png | Bin 0 -> 6699 bytes
static/image/shop/2.png | Bin 0 -> 1544 bytes
static/image/shop/3.png | Bin 0 -> 1208 bytes
static/image/shop/4.png | Bin 0 -> 2815 bytes
static/image/shop/5.png | Bin 0 -> 1553 bytes
static/image/shop/6.png | Bin 0 -> 3154 bytes
static/image/shop/7.png | Bin 0 -> 1267 bytes
static/logo.png | Bin 4023 -> 0 bytes
106 files changed, 186 insertions(+), 122 deletions(-)
create mode 100644 static/fonts/customer.ttf
create mode 100644 static/fonts/setting.ttf
create mode 100644 static/image/emoji/1.gif
create mode 100644 static/image/emoji/10.gif
create mode 100644 static/image/emoji/11.gif
create mode 100644 static/image/emoji/12.gif
create mode 100644 static/image/emoji/13.gif
create mode 100644 static/image/emoji/14.gif
create mode 100644 static/image/emoji/15.gif
create mode 100644 static/image/emoji/16.gif
create mode 100644 static/image/emoji/17.gif
create mode 100644 static/image/emoji/18.gif
create mode 100644 static/image/emoji/19.gif
create mode 100644 static/image/emoji/2.gif
create mode 100644 static/image/emoji/20.gif
create mode 100644 static/image/emoji/21.gif
create mode 100644 static/image/emoji/22.gif
create mode 100644 static/image/emoji/23.gif
create mode 100644 static/image/emoji/24.gif
create mode 100644 static/image/emoji/25.gif
create mode 100644 static/image/emoji/26.gif
create mode 100644 static/image/emoji/27.gif
create mode 100644 static/image/emoji/28.gif
create mode 100644 static/image/emoji/29.gif
create mode 100644 static/image/emoji/3.gif
create mode 100644 static/image/emoji/30.gif
create mode 100644 static/image/emoji/31.gif
create mode 100644 static/image/emoji/32.gif
create mode 100644 static/image/emoji/33.gif
create mode 100644 static/image/emoji/34.gif
create mode 100644 static/image/emoji/35.gif
create mode 100644 static/image/emoji/36.gif
create mode 100644 static/image/emoji/37.gif
create mode 100644 static/image/emoji/38.gif
create mode 100644 static/image/emoji/39.gif
create mode 100644 static/image/emoji/4.gif
create mode 100644 static/image/emoji/40.gif
create mode 100644 static/image/emoji/41.gif
create mode 100644 static/image/emoji/42.gif
create mode 100644 static/image/emoji/43.gif
create mode 100644 static/image/emoji/44.gif
create mode 100644 static/image/emoji/45.gif
create mode 100644 static/image/emoji/46.gif
create mode 100644 static/image/emoji/47.gif
create mode 100644 static/image/emoji/48.gif
create mode 100644 static/image/emoji/49.gif
create mode 100644 static/image/emoji/5.gif
create mode 100644 static/image/emoji/50.gif
create mode 100644 static/image/emoji/51.gif
create mode 100644 static/image/emoji/52.gif
create mode 100644 static/image/emoji/53.gif
create mode 100644 static/image/emoji/54.gif
create mode 100644 static/image/emoji/55.gif
create mode 100644 static/image/emoji/56.gif
create mode 100644 static/image/emoji/57.gif
create mode 100644 static/image/emoji/58.gif
create mode 100644 static/image/emoji/59.gif
create mode 100644 static/image/emoji/6.gif
create mode 100644 static/image/emoji/60.gif
create mode 100644 static/image/emoji/61.gif
create mode 100644 static/image/emoji/62.gif
create mode 100644 static/image/emoji/63.gif
create mode 100644 static/image/emoji/64.gif
create mode 100644 static/image/emoji/65.gif
create mode 100644 static/image/emoji/66.gif
create mode 100644 static/image/emoji/67.gif
create mode 100644 static/image/emoji/68.gif
create mode 100644 static/image/emoji/69.gif
create mode 100644 static/image/emoji/7.gif
create mode 100644 static/image/emoji/70.gif
create mode 100644 static/image/emoji/71.gif
create mode 100644 static/image/emoji/72.gif
create mode 100644 static/image/emoji/73.gif
create mode 100644 static/image/emoji/74.gif
create mode 100644 static/image/emoji/75.gif
create mode 100644 static/image/emoji/76.gif
create mode 100644 static/image/emoji/77.gif
create mode 100644 static/image/emoji/78.gif
create mode 100644 static/image/emoji/79.gif
create mode 100644 static/image/emoji/8.gif
create mode 100644 static/image/emoji/80.gif
create mode 100644 static/image/emoji/81.gif
create mode 100644 static/image/emoji/82.gif
create mode 100644 static/image/emoji/9.gif
create mode 100644 static/image/shop/1.png
create mode 100644 static/image/shop/2.png
create mode 100644 static/image/shop/3.png
create mode 100644 static/image/shop/4.png
create mode 100644 static/image/shop/5.png
create mode 100644 static/image/shop/6.png
create mode 100644 static/image/shop/7.png
delete mode 100644 static/logo.png
diff --git a/common/api/shop.js b/common/api/shop.js
index bc51f99..325b012 100644
--- a/common/api/shop.js
+++ b/common/api/shop.js
@@ -1,9 +1,12 @@
export default {
init(vm){
return {
- postlogn({id,name}){
- return vm.$u.get('url',{id,name});
- }
+ // 商品推荐
+ getGoodsRecommend({page}){
+ return vm.$u.post('Goods/getGoodsRecommend', {
+ page: page
+ });
+ }
}
}
diff --git a/common/api/user.js b/common/api/user.js
index 4b6dc40..6c60a7e 100644
--- a/common/api/user.js
+++ b/common/api/user.js
@@ -1,12 +1,6 @@
export default {
init(vm){
return {
- phoneRegister({member_mobile, sms_code}) {
- return vm.$u.post('auth/phoneRegister', {
- member_mobile: member_mobile,
- sms_code: sms_code
- });
- },
// 启动页
pageList({document_code}) {
return vm.$u.post('StartUp/pageList', {});
diff --git a/components/remaining/remaining.vue b/components/remaining/remaining.vue
index 858f2a0..799e7f7 100644
--- a/components/remaining/remaining.vue
+++ b/components/remaining/remaining.vue
@@ -1,6 +1,6 @@
-
+
-
+
跳过{{remaining}}
跳过
@@ -20,20 +20,21 @@
- 用户协议
-
- 亲,感谢您对德铭阳光在线的信任!
请注意,在您使用本软件过程中我们会按照《德铭阳光在线隐私保护声明》、《权限声明》 收集、使用和共享您的个人信息,请认真阅读并充分理解。特别提示:
1、为向您提供交易相关基本功能,我们会收集、使用必要的信息;
2、基于您的授权,我们可能会获取您的位置等信息,您有权拒绝或取消授权;
3、我们会采取业界先进的安全措施保护您的信息安全;
4、未经您同意,我们不会从第三方处获取、共享或向其提供您的信息;
5、您可以查询、更正、删除您的个人信息,我们也提供账户注销的渠道。
-
+ {{ agreement.document_title }}
+
+
+
+
我同意
-
-
-
-
-
-
-
+ }
+
diff --git a/components/shop/list/index.vue b/components/shop/list/index.vue
index 4a02a41..9abc1a8 100644
--- a/components/shop/list/index.vue
+++ b/components/shop/list/index.vue
@@ -4,16 +4,11 @@
商品推荐
- asd
- sda
- w3eq
+ 分类名称
+ {{ item.gc_name }}
-
-
-
-
-
+
@@ -23,7 +18,11 @@ export default {
name:"list",
components:{
item
- }
+ },
+ props: {
+ classifyList: Array,
+ goodsList: Array,
+ }
}