diff --git a/im/chat/chat.vue b/im/chat/chat.vue
index bad6fd1..ae7fc1c 100644
--- a/im/chat/chat.vue
+++ b/im/chat/chat.vue
@@ -1,148 +1,268 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.msg.content.text }}
+
+
+
+
+ {{ row.msg.content.text }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ row.message_length
+ ? row.message_length
+ : row.msg.content.length
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.msg.content.blessing }}
+
+
-
-
-
-
-
-
- {{row.msg.content.text}}
-
-
-
-
- {{row.msg.content.text}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{row.message_length?row.message_length:row.msg.content.length}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{row.msg.content.blessing}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{row.msg.userinfo.username}}
- {{row.msg.time}}
-
-
-
-
-
-
- {{row.translate_txt?row.translate_txt:__('翻译')}}
-
-
-
-
- {{row.message_length?row.message_length:row.msg.content.length}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{row.msg.content.blessing}}
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.msg.userinfo.username }}
+ {{ row.msg.time }}
+
+
+
+
+
+ {{ row.translate_txt ? row.translate_txt : __("翻译") }}
+
+
+
+
+ {{
+ row.message_length
+ ? row.message_length
+ : row.msg.content.length
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.msg.content.blessing }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ voiceTis }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ __("发送") }}
+
+
+
+
+
+
+
+
+
+
+ {{ recordTis }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 来自{{ redenvelopeData.from }}
+ {{ redenvelopeData.blessing }}
+ {{ redenvelopeData.money }}
+
+ 查看领取详情
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/im/chat/chat_nn.vue b/im/chat/chat_nn.vue
index 1b77b4c..ea27426 100644
--- a/im/chat/chat_nn.vue
+++ b/im/chat/chat_nn.vue
@@ -1,148 +1,268 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.msg.content.text }}
+
+
+
+
+ {{ row.msg.content.text }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ row.message_length
+ ? row.message_length
+ : row.msg.content.length
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.msg.content.blessing }}
+
+
-
-
-
-
-
-
- {{row.msg.content.text}}
-
-
-
-
- {{row.msg.content.text}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{row.message_length?row.message_length:row.msg.content.length}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{row.msg.content.blessing}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{row.msg.userinfo.username}}
- {{row.msg.time}}
-
-
-
-
-
-
- {{row.translate_txt?row.translate_txt:__('翻译')}}
-
-
-
-
- {{row.message_length?row.message_length:row.msg.content.length}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{row.msg.content.blessing}}
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.msg.userinfo.username }}
+ {{ row.msg.time }}
+
+
+
+
+
+ {{ row.translate_txt ? row.translate_txt : __("翻译") }}
+
+
+
+
+ {{
+ row.message_length
+ ? row.message_length
+ : row.msg.content.length
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.msg.content.blessing }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ voiceTis }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ __("发送") }}
+
+
+
+
+
+
+
+
+
+
+ {{ recordTis }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 来自{{ redenvelopeData.from }}
+ {{ redenvelopeData.blessing }}
+ {{ redenvelopeData.money }}
+
+ 查看领取详情
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/im/chat/emotion/index.vue b/im/chat/emotion/index.vue
index 24ba0f0..2ec4ff6 100644
--- a/im/chat/emotion/index.vue
+++ b/im/chat/emotion/index.vue
@@ -94,7 +94,7 @@
-
+
@@ -103,7 +103,7 @@
-
+
@@ -114,301 +114,312 @@
\ No newline at end of file
diff --git a/im/static/emoji/emojiData.js b/im/static/emoji/emojiData.js
index 9d1a664..ce540a1 100644
--- a/im/static/emoji/emojiData.js
+++ b/im/static/emoji/emojiData.js
@@ -51,7 +51,7 @@ var emojiData = {
{ url: '18.gif', alt: '[抓狂]' },
{ url: '19.gif', alt: '[吐]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
@@ -76,7 +76,7 @@ var emojiData = {
{ url: '38.gif', alt: '[敲打]' },
{ url: '39.gif', alt: '[再见]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: '40.gif', alt: '[擦汗]' },
@@ -100,7 +100,7 @@ var emojiData = {
{ url: '58.gif', alt: '[篮球]' },
{ url: '59.gif', alt: '[乒乓]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: '60.gif', alt: '[咖啡]' },
@@ -124,7 +124,7 @@ var emojiData = {
{ url: '78.gif', alt: '[拥抱]' },
{ url: '79.gif', alt: '[强]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: '80.gif', alt: '[弱]' },
@@ -148,7 +148,7 @@ var emojiData = {
{ url: '98.gif', alt: '[跳绳]' },
{ url: '99.gif', alt: '[投降]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: '100.gif', alt: '[激动]' },
@@ -157,7 +157,7 @@ var emojiData = {
{ url: '103.gif', alt: '[左太极]' },
{ url: '104.gif', alt: '[右太极]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
]
]
},
@@ -166,7 +166,7 @@ var emojiData = {
emojiName:"huoxinList",
emojiSort:2,
minEmoji:true,
- emojiPath:"https://static.lancerdt.com/xcxfile/appicon/im/img/huoxin/",
+ emojiPath:"https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/huoxin/",
emojiList: [
[
{ url: 'q_000.png', alt: '[测试1]' },
@@ -190,7 +190,7 @@ var emojiData = {
{ url: 'q_018.png', alt: '[]' },
{ url: 'q_019.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'q_020.png', alt: '[]' },
@@ -214,7 +214,7 @@ var emojiData = {
{ url: 'q_038.png', alt: '[]' },
{ url: 'q_039.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'q_040.png', alt: '[]' },
@@ -238,7 +238,7 @@ var emojiData = {
{ url: 'q_058.png', alt: '[]' },
{ url: 'q_059.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'q_060.png', alt: '[]' },
@@ -262,7 +262,7 @@ var emojiData = {
{ url: 'q_078.png', alt: '[]' },
{ url: 'q_079.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'q_080.png', alt: '[]' },
@@ -285,7 +285,7 @@ var emojiData = {
{ url: 'q_097.png', alt: '[]' },
{ url: 'q_098.png', alt: '[]' },
{ url: 'q_099.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'q_101.png', alt: '[]' },
@@ -308,7 +308,7 @@ var emojiData = {
{ url: 'q_118.png', alt: '[]' },
{ url: 'q_119.png', alt: '[]' },
{ url: 'q_120.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'q_121.png', alt: '[]' },
@@ -331,7 +331,7 @@ var emojiData = {
{ url: 'q_138.png', alt: '[]' },
{ url: 'q_139.png', alt: '[]' },
{ url: 'q_140.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'q_141.png', alt: '[]' },
@@ -354,7 +354,7 @@ var emojiData = {
{ url: 'q_158.png', alt: '[]' },
{ url: 'q_159.png', alt: '[]' },
{ url: 'q_160.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'q_161.png', alt: '[]' },
@@ -367,7 +367,7 @@ var emojiData = {
{ url: 'q_168.png', alt: '[]' },
{ url: 'q_169.png', alt: '[]' },
{ url: 'q_170.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
]
]
},
@@ -376,7 +376,7 @@ var emojiData = {
emojiName:"dingdingList",
emojiSort:2,
minEmoji:true,
- emojiPath:"https://static.lancerdt.com/xcxfile/appicon/im/img/dingding/",
+ emojiPath:"https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/dingding/",
emojiList: [
[
{ url: 'emotion_001.png', alt: '[微笑]' },
@@ -399,7 +399,7 @@ var emojiData = {
{ url: 'emotion_018.png', alt: '[抱拳]' },
{ url: 'emotion_019.png', alt: '[握手]' },
{ url: 'emotion_020.png', alt: '[OK]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'emotion_021.png', alt: '[]' },
@@ -422,7 +422,7 @@ var emojiData = {
{ url: 'emotion_038.png', alt: '[]' },
{ url: 'emotion_039.png', alt: '[]' },
{ url: 'emotion_040.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'emotion_041.png', alt: '[]' },
@@ -445,7 +445,7 @@ var emojiData = {
{ url: 'emotion_058.png', alt: '[]' },
{ url: 'emotion_059.png', alt: '[]' },
{ url: 'emotion_060.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'emotion_061.png', alt: '[]' },
@@ -468,7 +468,7 @@ var emojiData = {
{ url: 'emotion_078.png', alt: '[]' },
{ url: 'emotion_079.png', alt: '[]' },
{ url: 'emotion_080.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'emotion_081.png', alt: '[]' },
@@ -491,7 +491,7 @@ var emojiData = {
{ url: 'emotion_098.png', alt: '[]' },
{ url: 'emotion_099.png', alt: '[]' },
{ url: 'emotion_100.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'emotion_101.png', alt: '[]' },
@@ -514,7 +514,7 @@ var emojiData = {
{ url: 'emotion_118.png', alt: '[]' },
{ url: 'emotion_119.png', alt: '[]' },
{ url: 'emotion_120.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'emotion_121.png', alt: '[]' },
@@ -537,7 +537,7 @@ var emojiData = {
{ url: 'emotion_138.png', alt: '[]' },
{ url: 'emotion_139.png', alt: '[]' },
{ url: 'emotion_140.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
]
]
},
@@ -546,7 +546,7 @@ var emojiData = {
emojiName:"douyinList",
emojiSort:3,
minEmoji:true,
- emojiPath:"https://static.lancerdt.com/xcxfile/appicon/im/img/douyin/",
+ emojiPath:"https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/douyin/",
emojiList: [
[
{ url: '0.png', alt: '[抖音1]' },
@@ -570,7 +570,7 @@ var emojiData = {
{ url: '18.png', alt: '[]' },
{ url: '19.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: '20.png', alt: '[]' },
@@ -594,7 +594,7 @@ var emojiData = {
{ url: '38.png', alt: '[]' },
{ url: '39.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: '40.png', alt: '[]' },
@@ -618,7 +618,7 @@ var emojiData = {
{ url: '58.png', alt: '[]' },
{ url: '59.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: '60.png', alt: '[]' },
@@ -641,7 +641,7 @@ var emojiData = {
{ url: '77.png', alt: '[]' },
{ url: '78.png', alt: '[]' },
{ url: '79.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: '80.png', alt: '[]' },
@@ -665,7 +665,7 @@ var emojiData = {
{ url: '98.png', alt: '[]' },
{ url: '99.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: '100.png', alt: '[]' },
@@ -689,7 +689,7 @@ var emojiData = {
{ url: '118.png', alt: '[]' },
{ url: '119.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: '120.png', alt: '[]' },
@@ -713,12 +713,12 @@ var emojiData = {
{ url: '138.png', alt: '[]' },
{ url: '139.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: '140.png', alt: '[]' },
{ url: '141.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
]
]
},
@@ -726,7 +726,7 @@ var emojiData = {
emojiName:"ajmdList",
emojiSort:4,
minEmoji:false,
- emojiPath:"https://static.lancerdt.com/xcxfile/appicon/im/img/ajmd/",
+ emojiPath:"https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/ajmd/",
emojiList: [
[
{ url: '0.png', alt: '[ajmd1]' },
@@ -794,7 +794,7 @@ var emojiData = {
emojiName:"gongfuhuList",
emojiSort:5,
minEmoji:false,
- emojiPath:"https://static.lancerdt.com/xcxfile/appicon/im/img/gongfuhu/",
+ emojiPath:"https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/gongfuhu/",
emojiList: [
[
{ url: '0.gif', alt: '[]' },
@@ -841,7 +841,7 @@ var emojiData = {
emojiName:"xxyList",
emojiSort:6,
minEmoji: false,
- emojiPath:"https://static.lancerdt.com/xcxfile/appicon/im/img/xxy/",
+ emojiPath:"https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/xxy/",
emojiList: [
[
{ url: '0.png', alt: '[]' },
@@ -899,7 +899,7 @@ var emojiData = {
emojiName:"feineneList",
emojiSort:7,
minEmoji: false,
- emojiPath:"https://static.lancerdt.com/xcxfile/appicon/im/img/feinene/",
+ emojiPath:"https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/feinene/",
emojiList: [
[
{ url: '0.gif', alt: '[]' },
diff --git a/integral/integral/exchange.vue b/integral/integral/exchange.vue
index 99bbd33..a75fa6b 100644
--- a/integral/integral/exchange.vue
+++ b/integral/integral/exchange.vue
@@ -38,7 +38,7 @@
-
+
@@ -46,253 +46,438 @@
diff --git a/integral/integral/integral.vue b/integral/integral/integral.vue
index 70807be..8ab1da4 100644
--- a/integral/integral/integral.vue
+++ b/integral/integral/integral.vue
@@ -2,7 +2,7 @@
-
+
{{__('积分商城正在建设中...')}}
@@ -16,22 +16,22 @@
{{userInfo.user_nickname}}
- {{vipInfo.user_level_name}}
+ {{vipInfo.user_level_name}}
{{__('可用积分')}}：{{vipInfo.user_points || 0 }}
- {{__('兑换记录')}}
-
+ {{__('兑换记录')}}
+
- {{__('超值热兑')}}
+ {{__('超值热兑')}}
@@ -57,22 +57,22 @@
{{__('积分商品')}}
{{__('积分兑劵')}}
- {{__('筛选')}}
+ {{__('筛选')}}
-
+
{{__('积分商品')}}
- {{__('筛选')}}
+ {{__('筛选')}}
-
+
{{__('积分兑券')}}
- {{__('筛选')}}
+ {{__('筛选')}}
@@ -174,7 +174,7 @@
{{Coupons.StrValidateEnd}}
-
+
@@ -182,7 +182,7 @@
-
+
@@ -193,27 +193,27 @@
-
-
+
{{__('首页')}}
-
+
{{__('优惠券')}}
-
+
{{__('会员中心')}}
-
+
{{__('个人中心')}}
-
+
-
+
@@ -222,7 +222,7 @@
- {{Info1.Describe}}
@@ -251,228 +251,272 @@
diff --git a/integral/integral/product.vue b/integral/integral/product.vue
index 0589e60..e7305c8 100644
--- a/integral/integral/product.vue
+++ b/integral/integral/product.vue
@@ -297,7 +297,7 @@
-
+
@@ -325,7 +325,7 @@
-
+
@@ -352,14 +352,14 @@
-
+
-
+
@@ -1030,709 +1030,840 @@
diff --git a/member/address/list.vue b/member/address/list.vue
index 1efda91..2114b2f 100644
--- a/member/address/list.vue
+++ b/member/address/list.vue
@@ -394,13 +394,14 @@ export default {
// that.notice.postNotificationName("RefreshOrder", options);
// });
// }
+
if (item) {
var that = this;
var options = that.options;
+ if (options.issub != "true") return;
options.ud_id = item.ud_id;
options.address = item.ud_address;
that.$.navigateBack(1, function () {
- //console.info('SelectAddress')
that.notice.postNotificationName("RefreshOrder", options);
});
}
diff --git a/member/address/manage.vue b/member/address/manage.vue
index c920cbf..ba7caf9 100644
--- a/member/address/manage.vue
+++ b/member/address/manage.vue
@@ -107,7 +107,7 @@
/>
@@ -290,6 +290,9 @@ export default {
cityData: [],
provinceData: [],
isFound: false,
+ issub: false,
+ options: {},
+ spid: "",
};
},
computed: {
@@ -312,7 +315,7 @@ export default {
if (city) {
this.originalData.result.addressComponent.city = city;
} else {
- if (this.ud_id) {
+ if (this.ud_id && this.ud_id != "-1") {
this.getCurrAddress();
} else {
this.getLocation();
@@ -323,6 +326,13 @@ export default {
if (options.ud_id) {
this.ud_id = options.ud_id;
}
+
+ this.setData({
+ issub: options.issub,
+ ud_id: options.ud_id || 0,
+ spid: options.spid || "",
+ options: options,
+ });
},
methods: {
getAppDistrict() {
@@ -370,14 +380,13 @@ export default {
that.formData.userPhone = data.ud_mobile;
that.formData.lableName = data.ud_label - 1;
that.formData.sexType = data.ud_gender;
-
let item = {
name: data.ud_marker,
location: {
lat: data.ud_latitude,
lng: data.ud_longitude,
},
- addr: data.ud_address,
+ addr: data.ud_street_addr,
};
that.handerSetAddress(item);
@@ -590,19 +599,19 @@ export default {
}
},
//数据回显时使用此方法
- setData(obj) {
- this.oldObj = obj;
- this.formData.detailAddress = obj.detailAddress;
- this.formData.userName = obj.userName;
- this.formData.userPhone = obj.userPhone;
- this.formData.lableName = obj.lableName;
- this.formData.sexType = obj.sexType;
- this.addressInfo.title = obj.title;
- this.addressInfo.address = obj.address;
- this.addressInfo.latitude = obj.latitude;
- this.addressInfo.longitude = obj.longitude;
- this.agreeState = obj.agreeState;
- },
+ // setData(obj) {
+ // this.oldObj = obj;
+ // this.formData.detailAddress = obj.detailAddress;
+ // this.formData.userName = obj.userName;
+ // this.formData.userPhone = obj.userPhone;
+ // this.formData.lableName = obj.lableName;
+ // this.formData.sexType = obj.sexType;
+ // this.addressInfo.title = obj.title;
+ // this.addressInfo.address = obj.address;
+ // this.addressInfo.latitude = obj.latitude;
+ // this.addressInfo.longitude = obj.longitude;
+ // this.agreeState = obj.agreeState;
+ // },
//获取当前的地理位置
getLocation(type) {
let that = this;
@@ -658,7 +667,7 @@ export default {
const lowerShortStr = shortStr.toLowerCase();
const lowerLongStr = longStr.toLowerCase();
- return lowerLongStr.includes(lowerShortStr);
+ return lowerShortStr.includes(lowerLongStr);
},
//保存地址
submitAddress() {
@@ -703,6 +712,7 @@ export default {
}
let item = this.originalData;
+
let province = {
label: "",
value: 0,
@@ -720,8 +730,8 @@ export default {
this.provinceData.forEach((group) => {
let isFind = this.fuzzyMatch(
- group.label,
- item.result.addressComponent.province
+ item.result.addressComponent.province,
+ group.label
);
if (isFind) {
province = group;
@@ -773,17 +783,20 @@ export default {
ud_street_no: this.formData.detailAddress,
ud_latitude: this.latitude,
ud_longitude: this.longitude,
- ud_label: lableName,
+ ud_label: lableName || "",
ud_province_id: province.value, // 省份ID
ud_province: province.label, // 省份名称
ud_city_id: city.value, // ud_city_id 城市ID
ud_city: city.label, // 城市名称
ud_county_id: county.value, // 区ID
ud_county: county.label, // 区名字
- ud_address: this.currRoadAddress,
- ud_is_default: 0,
+ ud_address: this.currAddress + this.formData.detailAddress,
+ ud_is_default: 1,
};
+ let that = this;
+ var options = that.options;
+
this.$.request({
url: this.Config.URL.user.address_edit,
method: "post",
@@ -795,7 +808,16 @@ export default {
icon: "success",
duration: 2e3,
});
- uni.navigateBack();
+ if (options.issub) {
+ that.$.navigateBack(1, function () {
+ options.ud_id = data.ud_id;
+ that.notice.postNotificationName("RefreshOrder", options);
+ });
+ } else {
+ that.$.navigateBack(1, function () {
+ that.notice.postNotificationName("RefreshAddress", 1);
+ });
+ }
}
},
});
@@ -980,7 +1002,6 @@ export default {
};
return obj;
});
-
console.log("that.searchAddress", that.searchAddress);
that.searchAddress.forEach((item) => {
@@ -1001,7 +1022,7 @@ export default {
region: this.originalData.result.addressComponent.city,
output: "json",
city_limit: true,
- ak: "vMqiMPVK8i30Q5VOCDI3LWxgZqR2tfKa",
+ ak: "qWKt2xbrqXsp2yK35YYXVBNZgrbiCG5v",
ret_coordtype: "gcj02ll",
};
diff --git a/member/fanxiao-sign/sigin-in.vue b/member/fanxiao-sign/sigin-in.vue
index bd9691e..5e9bccb 100644
--- a/member/fanxiao-sign/sigin-in.vue
+++ b/member/fanxiao-sign/sigin-in.vue
@@ -1,187 +1,203 @@
-
-
-
-
- 本月你已连续签到
- {{ signDays || 0 }}
- 天
-
-
-
-
-
-
-
-
-
- {{ item.value_str }}
-
-
- 签到{{ item.days }}天
-
-
-
-
-
-
- 今日签到
- 已签到
-
-
-
+
+
+
+
+ 本月你已连续签到
+ {{ signDays || 0 }}
+ 天
+
+
+
+
+
+
+
+
+
+ {{
+ item.value_str
+ }}
+
+
+ 签到{{ item.days }}天
+
+
+
+
+
+
+ 今日签到
+ 已签到
+
+
+
diff --git a/member/member/bindphone.vue b/member/member/bindphone.vue
index db16d40..c6a2c01 100644
--- a/member/member/bindphone.vue
+++ b/member/member/bindphone.vue
@@ -1,553 +1,685 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
- {{user_intl}}{{Phone}}
-
-
-
-
- {{user_intl}}
-
+
+
+
+
+
+
+ {{ user_intl }}{{ Phone }}
+
+
+
+
+ {{
+ user_intl
+ }}
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
- {{btntext}}
- {{btntext}}
-
-
-
+
+
+
+
+
+
+ {{
+ btntext
+ }}
+ {{ btntext }}
+
+
+
-
-
-
- {{sprintf(__('验证码为：%s'), code)}}
-
-
-
-
+
+
+
+ {{ sprintf(__("验证码为：%s"), code) }}
+
+
+
+
-
-
-
-
-
-
-
-
- {{user_intl}}{{Phone}}
-
-
-
-
- {{user_intl}}
-
+
+
+
+
+
+
+
+
+ {{ user_intl }}{{ Phone }}
+
+
+
+
+ {{
+ user_intl
+ }}
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
- {{btntext}}
- {{btntext}}
-
-
-
+
+
+
+
+
+
+ {{
+ btntext
+ }}
+ {{ btntext }}
+
+
+
-
-
-
- {{sprintf(__('验证码为：%s'), code)}}
-
-
-
-
-
+
+
+
+ {{ sprintf(__("验证码为：%s"), code) }}
+
+
+
+
+
\ No newline at end of file
diff --git a/member/member/coupon-dh.vue b/member/member/coupon-dh.vue
index 48e38ad..d4a5e61 100644
--- a/member/member/coupon-dh.vue
+++ b/member/member/coupon-dh.vue
@@ -1,663 +1,862 @@
-
-
-
-
- {{__('全部')}}({{numAllCouponed}})
-
-
- {{__('线下券')}}({{numOfflined}})
-
-
- {{__('线上券')}}({{numOnlined}})
-
-
-
- {{__('筛选')}}
-
-
-
+
+ {{ __("筛选") }}
+
+
+
-
-
-
-
-
- {{__('优惠券状态')}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{
+ __("优惠券状态")
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
- {{item.activity_name}}
- (线下)
-
-
- {{sprintf(__('满￥%s可用'), item.voucher_subtotal)}}
- {{__('有效日期：')}}{{ item.voucher_start_date }}{{__('至')}}{{ item.voucher_end_date }}
-
-
-
-
-
-
-
- {{item.voucher_price}}
-
-
- {{__('立即使用')}}
-
-
-
-
-
-
-
-
-
-
- {{__('正在加载')}}
-
-
-
-
- {{__('没有更多数据啦！')}}
-
-
-
-
-
+
+
+
+
+
+
+ {{ item.activity_name }}
+ (线下)
+
+
+ {{
+ sprintf(__("满￥%s可用"), item.voucher_subtotal)
+ }}
+ {{ __("有效日期：") }}{{ item.voucher_start_date
+ }}{{ __("至") }}{{ item.voucher_end_date }}
+
+
+
+
+
+
+
+ {{ item.voucher_price }}
+
+
+ {{ __("立即使用") }}
+
+
+
+
+
+
+
+
+
+
+ {{ __("正在加载") }}
+
+
+
+
+ {{ __("没有更多数据啦！") }}
+
+
+
+
+
-
-
-
- {{__('亲~什么都没有')}}
- {{__('赶快去领券中心吧')}}
-
-
-
-
-
-
-
-
-
- {{__('领取更多优惠券')}}
-
-
+
+
+
+ {{ __("亲~什么都没有") }}
+ {{ __("赶快去领券中心吧") }}
+
+
+
+
+
+
+
+
+
+ {{ __("领取更多优惠券") }}
+
+
-
-
-
-
-
- {{__('￥')}}
- {{sprintf(__('满￥%s可用'), item.voucher_subtotal)}}
-
-
- {{item.Name}}
-
-
-
-
+
+
+
+
+
+ {{ __("￥") }}
+ {{
+ sprintf(__("满￥%s可用"), item.voucher_subtotal)
+ }}
+
+
+ {{ item.Name }}
+
+
+
+
- {{item.CouponUserDesc}}
-
-
-
-
-
-
-
-
- {{__('亲~什么都没有')}}
- {{__('赶快去领券中心吧')}}
-
-
-
-
-
-
-
- {{__('正在加载')}}
-
-
-
-
- {{__('没有更多数据啦！')}}
-
-
-
-
-
-
-
+ {{ item.CouponUserDesc }}
+
+
+
+
+
+
+
+
+ {{ __("亲~什么都没有") }}
+ {{ __("赶快去领券中心吧") }}
+
+
+
+
+
+
+
+ {{ __("正在加载") }}
+
+
+
+
+ {{ __("没有更多数据啦！") }}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/member/member/coupon.vue b/member/member/coupon.vue
index 6306eee..d6252e1 100644
--- a/member/member/coupon.vue
+++ b/member/member/coupon.vue
@@ -1,664 +1,797 @@
-
-
-
-
- {{__('全部')}}({{numAllCouponed}})
-
-
- {{__('线下券')}}({{numOfflined}})
-
-
- {{__('线上券')}}({{numOnlined}})
-
-
- {{__('车享券')}}
-
-
- {{__('筛选')}}
-
-
-
+
+
+
+
+ {{ __("全部") }}({{ numAllCouponed }})
+
+
+ {{ __("线下券") }}({{ numOfflined }})
+
+
+ {{ __("线上券") }}({{ numOnlined }})
+
+
+ {{ __("车享券") }}
+
+
+ {{ __("筛选") }}
+
+
+
-
-
-
-
-
- {{__('优惠券状态')}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{
+ __("优惠券状态")
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
- {{__('亲~什么都没有')}}
- {{__('赶快去领券中心吧')}}
-
-
-
-
-
-
-
-
-
- {{__('领取更多优惠券')}}
-
-
+
+
+
+
+
+
+
+
+
+ {{ __("亲~什么都没有") }}
+ {{ __("赶快去领券中心吧") }}
+
+
+
+
+
+
+
+
+
+ {{ __("领取更多优惠券") }}
+
+
-
-
-
-
-
- {{__('￥')}}
- {{sprintf(__('满￥%s可用'), item.voucher_subtotal)}}
-
-
- {{item.Name}}
-
-
-
-
+
+
+
+
+
+ {{ __("￥") }}
+ {{
+ sprintf(__("满￥%s可用"), item.voucher_subtotal)
+ }}
+
+
+ {{ item.Name }}
+
+
+
+
- {{item.CouponUserDesc}}
-
-
-
-
-
-
-
-
- {{__('亲~什么都没有')}}
- {{__('赶快去领券中心吧')}}
-
-
-
-
-
-
-
- {{__('正在加载')}}
-
-
-
-
- {{__('没有更多数据啦！')}}
-
-
-
-
-
-
-
+ {{ item.CouponUserDesc }}
+
+
+
+
+
+
+
+
+ {{ __("亲~什么都没有") }}
+ {{ __("赶快去领券中心吧") }}
+
+
+
+
+
+
+
+ {{ __("正在加载") }}
+
+
+
+
+ {{ __("没有更多数据啦！") }}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/member/member/data.vue b/member/member/data.vue
index 16a028f..0c7ad97 100644
--- a/member/member/data.vue
+++ b/member/member/data.vue
@@ -1,302 +1,457 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ btntext
+ }}
+ {{ btntext }}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{btntext}}
- {{btntext}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/member/member/options.vue b/member/member/options.vue
index 15a278b..def3264 100644
--- a/member/member/options.vue
+++ b/member/member/options.vue
@@ -1,241 +1,296 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+ {{ __("基本信息") }}
+
+
+
-
-
-
-
-
- {{__('基本信息')}}
-
-
-
+
+
+
+
+
+ {{ __("登录密码") }}
+
+
+
+
+
+
+
+
+
+ {{ __("实名认证") }}
+
+
+
-
-
-
-
-
- {{__('登录密码')}}
-
-
-
+
+
+
+
+
+ {{ __("认证会员") }}
+
+
+
-
-
-
-
-
- {{__('支付密码')}}
-
-
-
+
+
+
+
+
+ {{ __("提现协议") }}
+
+
+
+
+
+
+
+
+
+ {{ __("隐私政策") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ __("账号注销") }}
+
+
+
+
+
+
+
+
+ {{ __("用户反馈") }}
+
+
+
+
+
+
+
+
+ {{ __("关于我们") }}
+
+
+
+
+
+
-
-
-
-
-
- {{__('实名认证')}}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
- {{__('认证会员')}}
-
-
-
-
-
-
-
-
-
- {{__('提现协议')}}
-
-
-
-
-
-
-
-
-
- {{__('提现账户')}}
-
-
-
-
-
-
-
-
-
- {{__('隐私政策')}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ __('账号注销') }}
-
-
-
-
-
-
-
-
- {{ __('用户反馈') }}
-
-
-
-
-
-
-
-
- {{ __('关于我们') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{__('商城套件系统提供技术支持')}} {{versionNumber}}
-
-
- {{versionName}}{{versionNumber}}
-
-
-
-
- {{__('绑定手机号')}}
- {{__('您当前尚未绑定手机号，建议您绑定以获得更多优惠资讯')}}
-
-
- {{__('取消')}}
-
-
-
-
-
+
+
+
+
+ {{ __("商城套件系统提供技术支持") }} {{ versionNumber }}
+
+
+ {{ versionName }}{{ versionNumber }}
+
+
+
+
+ {{ __("绑定手机号") }}
+ {{
+ __("您当前尚未绑定手机号，建议您绑定以获得更多优惠资讯")
+ }}
+
+
+ {{ __("取消") }}
+
+
+
+
+
\ No newline at end of file
diff --git a/member/member/supermarketlList.vue b/member/member/supermarketlList.vue
new file mode 100644
index 0000000..b8d99bd
--- /dev/null
+++ b/member/member/supermarketlList.vue
@@ -0,0 +1,863 @@
+
+
+
+
+ 门店列表
+
+
+
+
+
+
+
+
+ {{
+ originalData.result.sematic_description
+ }}
+
+
+
+
+ 重新定位
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.store_name }}
+ {{ item.store_opening_hours }}~{{
+ item.store_close_hours
+ }}
+
+ {{ item.store_address }}
+
+ {{
+ (item.distance / 1000).toFixed(2)
+ }}
+ km
+
+
+
+
+
+
+
+ 上门自提
+ 同城配送
+
+
+ 详细
+
+
+
+
+
+
+
+ {{ __("正在加载") }}
+
+
+
+
+ {{ __("没有更多数据啦！") }}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/member/member/task.vue b/member/member/task.vue
index 83c7cf2..36c222d 100644
--- a/member/member/task.vue
+++ b/member/member/task.vue
@@ -1,1023 +1,1368 @@
-
-
-
-
-
-
- {{message.user_growth}}
- {{__('成长值')}}
-
-
- {{number_format(message.user_money, 2)}}
- {{__('余额')}}
-
-
- {{message.voucher}}
- {{__('优惠券')}}
-
-
- {{number_format(message.user_points)}}
- {{__('积分')}}
-
-
+
+
+
+
+
+
+ {{ message.user_growth }}
+ {{ __("成长值") }}
+
+
+ {{ number_format(message.user_money, 2) }}
+ {{ __("余额") }}
+
+
+ {{ message.voucher }}
+ {{ __("优惠券") }}
+
+
+ {{ number_format(message.user_points) }}
+ {{ __("积分") }}
+
+
+
+
+ {{
+ __("会员权益")
+ }}
+
+
-
-
- {{__('会员权益')}}
-
-
+
+ {{ __("尊敬的会员，您现在无会员折扣可以使用。") }}
+
+
+
+ {{ __("尊敬的会员，您在购物时可享受")
+ }}{{ message.user_level_rate / 10 }}{{ __("折优惠") }}
+
+
+
+
+
+ {{ __("任务中心") }}
+
+
+
+
+
+ {{ __("签到领积分") }}
+
+
+
+
+
+
+ {{ __("购物领积分") }}
+
+ {{ __("去购物") }}
+
+
+
+
+
+ {{ __("评价领积分") }}
+
+ {{ __("去评价") }}
+
+
+
+
+ {{ signMsg }}
+
+
+ {{ __("抱歉！今日您已签到") }}
+ {{ __("~明天再来哦~") }}
+
+
+
-
- {{__('尊敬的会员，您现在无会员折扣可以使用。')}}
-
-
-
- {{__('尊敬的会员，您在购物时可享受')}}{{message.user_level_rate/10}}{{__('折优惠')}}
-
-
-
-
-
- {{__('任务中心')}}
-
-
-
-
-
- {{__('签到领积分')}}
-
-
-
-
-
-
- {{__('购物领积分')}}
-
- {{__('去购物')}}
-
-
-
-
-
- {{__('评价领积分')}}
-
- {{__('去评价')}}
-
-
-
-
- {{signMsg}}
-
-
- {{__('抱歉！今日您已签到')}}
- {{__('~明天再来哦~')}}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/member/order/detail.vue b/member/order/detail.vue
index c486384..3ce6652 100644
--- a/member/order/detail.vue
+++ b/member/order/detail.vue
@@ -1,440 +1,1235 @@
-
-
-
-
-
+
+
+
+
+
+ 订单{{ formatOrderName(OrderInfo.order_state_name) }}
+
+
+
+
+
+
+
-
-
- {{__('订单取消倒计时')}} {{remain_pay_time_str}}
-
-
+
+
+ {{ __("订单取消倒计时") }}
+
+ {{ remain_pay_time_str }}
+
+
+
+
-
-
-
- {{sprintf(__('编号：%s'), OrderInfo.order_id)}}
- {{(OrderInfo.payment_type_id==StateCode.PAYMENT_TYPE_DELIVER || OrderInfo.payment_type_id==StateCode.PAYMENT_TYPE_OFFLINE) ? __('货到付款') : __('在线支付')}}
-
- {{OrderInfo.order_state_name}}
-
-
-
-
- {{sprintf(__('物流单号： %s'), logistics_item.order_tracking_number||"")}}
-
-
- {{sprintf(__('物流公司： %s'), logistics_item.logistics_name||"")}}
-
-
- {{__('查看物流')}}
-
-
-
-
-
-
-
- {{sprintf(__('送货人：%s %s'), OrderInfo.LogisticCode, OrderInfo.Shipper)}}
-
-
-
-
-
-
- {{sprintf(__('提货人：%s %s'), OrderInfo.LogisticCode, OrderInfo.Shipper)}}
-
-
-
-
-
+
+ 订单{{ formatOrderName(OrderInfo.order_state_name) }}
+ {{ orderTips() }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 评价
+
+ {{ __("查看评价") }}
+
+ 联系客服
+
+ 再来一单
+ {{ __("确认收货") }}
+
+ {{ __("取消订单") }}
+ 立即支付
+
-
-
-
- {{OrderInfo.delivery.da_name}}
- {{OrderInfo.delivery.da_mobile}}
-
-
- {{OrderInfo.delivery.da_province}}/{{OrderInfo.delivery.da_city}}/{{OrderInfo.delivery.da_county}}
- {{OrderInfo.delivery.da_address}}
-
-
-
+
+
+
+ {{
+ sprintf(
+ __("物流单号： %s"),
+ logistics_item.order_tracking_number || ""
+ )
+ }}
+
+
+ {{
+ sprintf(
+ __("物流公司： %s"),
+ logistics_item.logistics_name || ""
+ )
+ }}
+
+
+ {{ __("查看物流") }}
+
+
+
+
+
+
+
+ {{
+ sprintf(
+ __("送货人：%s %s"),
+ OrderInfo.LogisticCode,
+ OrderInfo.Shipper
+ )
+ }}
+
+
+
+
+
+
+ {{
+ sprintf(
+ __("提货人：%s %s"),
+ OrderInfo.LogisticCode,
+ OrderInfo.Shipper
+ )
+ }}
+
+
+
+
+
-
-
- {{sprintf(__('预约人：%s'), OrderInfo.delivery.da_name)}}
-
-
- {{sprintf(__('电话：%s'), OrderInfo.delivery.da_mobile)}}
-
-
+
+ 订单信息
+
+ 配送地址
+
+ {{ OrderInfo.delivery.da_address }}
+ {{ OrderInfo.delivery.da_name
+ }}{{ desensitizationMobile(OrderInfo.delivery.da_mobile) }}
+
+
+
+ 订单号码
+ {{ OrderInfo.order_id }}
+
+
+ 配送方式
+ {{
+ deliveryTypeName(OrderInfo.delivery_type_id)
+ }}
+
+
+ 顺丰订单号
+ {{ OrderInfo.sf_order_id }}
+
+
+
+ 物流单号
+ {{
+ logistics_item.order_tracking_number || ""
+ }}
+
+
+ 物流公司
+ {{
+ logistics_item.logistics_name || ""
+ }}
+
+
+ {{ __("查看物流") }}
+
+
+
+
+ 送货人
+ {{
+ OrderInfo.LogisticCode + OrderInfo.Shipper
+ }}
+
+
+ 提货人
+ {{
+ OrderInfo.LogisticCode + OrderInfo.Shipper
+ }}
+
+
+ 下单时间
+ {{ OrderInfo.order_time }}
+
+
+ 支付方式
+ {{
+ OrderInfo.payment_type_id == StateCode.PAYMENT_TYPE_DELIVER ||
+ OrderInfo.payment_type_id == StateCode.PAYMENT_TYPE_OFFLINE
+ ? __("货到付款")
+ : __("在线支付")
+ }}
+
+
+ {{ __("备注") }}
+ {{
+ OrderInfo.order_message
+ }}
+
+
-
-
- {{sprintf(__('服务码：%s'), OrderInfo.chain_code)}}
-
+
+
-
-
-
- {{__('商家电话')}}
-
-
-
- {{OrderInfo.store_tel}}
-
-
-
-
- {{__('商家地址')}}
-
+
+
+ {{
+ sprintf(__("服务码：%s"), OrderInfo.chain_code)
+ }}
+
-
- {{OrderInfo.store_address}}
-
-
+
+
+
+ {{ __("商家电话") }}
+
+
+
+
+ {{ OrderInfo.store_tel }}
+
+
+
+
+ {{ __("商家地址") }}
+
-
-
- {{__('到店日期')}}
-
- {{OrderInfo.virtual_service_date}}
-
-
+
+
+ {{ OrderInfo.store_address }}
+
+
+
+
+ {{ __("到店日期") }}
+
+ {{
+ OrderInfo.virtual_service_date
+ }}
+
+
-
-
-
- {{__('营业时间')}}
-
- {{OrderInfo.store_opening_hours}} - {{OrderInfo.store_close_hours}}
-
-
-
- {{OrderInfo.store_address}}{{OrderInfo.store_address}}
-
-
-
- 离您 {{OrderInfo.distance}}
-
-
-
+
+
+
+ {{ __("营业时间") }}
+
+ {{ OrderInfo.store_opening_hours }} -
+ {{ OrderInfo.store_close_hours }}
+
+
+
+ {{ OrderInfo.store_address }}{{ OrderInfo.store_address }}
+
+
+
+ 离您 {{ OrderInfo.distance }}
+
+
+
-
-
-
-
-
-
- {{OrderInfo.store_name}}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 商品费用
+
+
+
+
+ {{ OrderInfo.store_name }}
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- {{item.order_item_unit_price}}
-
-
+
+
+
+
+
+ ￥{{
+ item.item_unit_price
+ }}
+
+
+
-
- {{item.item_unit_points}}{{__('积分')}}
-
+
+ {{ item.item_unit_points }}{{ __("积分") }}
+
-
- {{item.item_unit_sp}}{{__('众宝')}}
-
+
+ {{ item.item_unit_sp }}{{ __("众宝") }}
+
- x{{item.order_item_quantity}}
+
+ {{ __("退货") }}
+
+ {{ __("售后详情") }}
+
+
+
+
+
+ {{ __("运费") }}
+
+
+ ￥{{
+ OrderInfo.order_shipping_fee
+ }}
+
+
+
+
+ {{ __("活动优惠") }}
+
+
+ - ￥{{
+ OrderInfo.order_discount_amount
+ }}
+
+
+
+
+ {{ __("优惠券") }}
+
+
+ ￥{{
+ OrderInfo.voucher_price
+ }}
+
+
+
+
+ {{ __("会员折扣")
+ }}{{
+ sprintf(__("%s折"), OrderInfo.MomentMemberDiscount)
+ }}
+
+
+ ￥{{
+ OrderInfo.LevelDiscount
+ }}
+
+
+
+
+ {{ __("积分") }}
+
+
+ -{{ OrderInfo.order_resource_ext1 }} {{ __("积分") }}
+
+
+
+
+ {{ __("众宝") }}
+
+
+ -{{ OrderInfo.order_resource_ext2 }} {{ __("众宝") }}
+
+
+
+
+ {{ __("积分抵现") }}
+
+
+ -￥{{
+ OrderInfo.PointAsCash
+ }}
+
+
+
+
+ {{ __("余额抵扣") }}
+
+
+ -￥{{ deduction }}
+
+
+
+
+ {{ __("总金额") }}
+
+
+ ￥{{
+ OrderInfo.order_payment_amount
+ }}
+
+
+
+
+ {{ __("待付款") }}
+
+
+ ￥{{
+ OrderInfo.trade.trade_payment_amount
+ }}
+
+
+
+
+ 优惠券
+
+
+ {{ __("确认领券") }}
+
+
+
+
+
+
+
+
+
+ {{ __("门店名称") }}
+
+
+
+
+ {{ OrderInfo.chain_name }}
+
+
+
+
+ {{ __("预约时间") }}
+
+ {{
+ OrderInfo.virtual_service_time
+ }}
+
+
+
+ {{ __("商家电话") }}
+
+
+
+
+ {{ OrderInfo.chain_mobile }}
+
+
+
+
+ {{ __("商家地址") }}
+
+ {{ OrderInfo.chain_address }}
+
+
+
+
+
+
+ {{ __("限时折扣") }}
+ {{
+ __("满减")
+ }}
+ {{ __("折上折") }}
+ {{ __("单件折") }}
+ {{ __("多件折") }}
+ {{
+ __("组合套餐")
+ }}
+
+
+ -{{ __("￥") }}{{ number_format(item.discount, 2) }}
+
+
+
+
-
- {{__('退货')}}
-
- {{__('售后详情')}}
+
-
+
+
+
+
-
-
-
-
-
- 联系客服
-
-
-
- {{__('备注')}}
-
-
-
- {{OrderInfo.order_message}}
-
-
-
-
-
-
-
-
- {{__('门店名称')}}
-
-
-
- {{OrderInfo.chain_name}}
-
-
-
-
- {{__('预约时间')}}
-
- {{OrderInfo.virtual_service_time}}
-
-
-
- {{__('商家电话')}}
-
-
-
- {{OrderInfo.chain_mobile}}
-
-
-
-
- {{__('商家地址')}}
-
- {{OrderInfo.chain_address}}
-
-
-
- {{__('商品总额')}}
-
- {{__('￥')}}{{OrderInfo.order_item_amount}}
-
-
-
- {{__('活动优惠')}}
-
- -{{__('￥')}}{{OrderInfo.order_discount_amount}}
-
-
-
-
- {{__('限时折扣')}}
- {{__('满减')}}
- {{__('折上折')}}
- {{__('单件折')}}
- {{__('多件折')}}
- {{__('组合套餐')}}
-
-
- -{{__('￥')}}{{number_format(item.discount,2)}}
-
-
-
-
+
-
-
- {{__('优惠券')}}
-
- -{{__('￥')}}{{OrderInfo.voucher_price}}
-
+
+
-
-
-
- {{__('会员折扣')}}
- {{sprintf(__('%s折'), OrderInfo.MomentMemberDiscount)}}
-
- -{{__('￥')}}{{OrderInfo.LevelDiscount}}
-
-
-
-
- {{__('积分')}}
-
- -{{OrderInfo.order_resource_ext1}} {{__('积分')}}
-
+
+
+
+
+
+
-
-
- {{__('众宝')}}
-
- -{{OrderInfo.order_resource_ext2}} {{__('众宝')}}
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ __("正在加载") }}
+
+
+
+
+
+
-
-
-
- {{__('积分抵现')}}
-
- -{{__('￥')}}{{OrderInfo.PointAsCash}}
-
-
-
- {{__('余额抵扣')}}
-
- -{{__('￥')}}{{deduction}}
-
-
-
- {{__('运费')}}
-
- +{{__('￥')}}{{OrderInfo.order_shipping_fee}}
-
-
-
-
-
-
- {{__('总金额')}}：
-
-
-
- {{__('待付款')}}：
-
-
- {{sprintf(__('下单时间：%s'), OrderInfo.order_time)}}
-
-
-
-
- {{__('确认领券')}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{__('正在加载')}}
-
-
-
-
-
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/member/order/list.vue b/member/order/list.vue
index 6b55ec5..e2e3853 100644
--- a/member/order/list.vue
+++ b/member/order/list.vue
@@ -1,5 +1,5 @@
-
+
@@ -8,54 +8,56 @@
scroll-x
style="width: 100%"
>
-
- {{ __("全部订单") }}
-
-
- {{ __("待支付") }}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 全部
+
+
+ {{ __("待支付") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -78,7 +80,8 @@
style=""
hover-class="none"
>
-
+
+
{{ items.store_name }}
@@ -94,63 +97,135 @@
? __("货到付款")
: __("在线支付")
}}
-
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
- {{ item.order_item_unit_price }}
-
+
+
-
- {{ item.item_unit_points }}{{ __("积分") }}
-
+
+
+
+
+
+
+
+
+
+ 共{{ items.item.length }}件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 共{{ items.item.length }}件
@@ -175,7 +250,7 @@
-
+
{{ __("再下一单") }}
@@ -478,6 +553,19 @@ export default {
"forceUserInfo",
"getUserInfo",
]),
+ formatOrderName(name) {
+ switch (name) {
+ case "已取消/已作废":
+ return "已取消";
+ break;
+ case "已完成/已签收":
+ return "已完成";
+ break;
+ default:
+ return name;
+ }
+ },
+ formatAmout(amout) {},
RefreshMessage: function (e) {
this.setData({
tapindex: 1,
@@ -595,7 +683,8 @@ export default {
url: this.Config.URL.user.order_lists,
data: params,
success: function (data, status, msg, code) {
- if (200 == status && data.items.length > 0) {
+ console.log(data);
+ if (status == 200 && data && data.items.length > 0) {
if (data.page >= data.total) {
that.setData({
flag: false,
@@ -825,206 +914,345 @@ export default {
\ No newline at end of file
diff --git a/member/product/return.vue b/member/product/return.vue
index 2268f84..9eb07a4 100644
--- a/member/product/return.vue
+++ b/member/product/return.vue
@@ -168,7 +168,6 @@ export default {
success: function (n) {
that.$.hideLoading();
var up_res = that.$.parseJSON(n.data);
- debugger;
var s = up_res.data.url;
dataInfo.comment_image.push(s);
that.setData({ data_info: dataInfo });
diff --git a/pages.json b/pages.json
index 6116cf6..20fc26f 100644
--- a/pages.json
+++ b/pages.json
@@ -107,7 +107,7 @@
"style": {
"navigationBarTitleText": "购物车",
"enablePullDownRefresh": true,
- "navigationStyle": "custom",
+ // "navigationStyle": "custom",
"app-plus": {
"titleNView": {
"type": "transparent"
@@ -269,6 +269,14 @@
"navigationBarTitleText": "成长值"
}
},
+ {
+ "path": "member/supermarketlList",
+ "style": {
+ "navigationBarTitleText": "超市列表",
+ "enablePullDownRefresh":true,
+ "navigationStyle": "custom"
+ }
+ },
{
"path": "member/options",
"style": {
@@ -511,7 +519,7 @@
{
"path": "order/detail",
"style": {
- "navigationBarTitleText": "订单详情"
+ "navigationStyle": "custom"
}
},
{
@@ -1488,24 +1496,25 @@
"backgroundColor": "#ffffff",
"selectedColor": "#DB384C",
- "list": [{
- "pagePath": "pages/index/index",
- "iconPath": "static/images/tabBar1.png",
- "selectedIconPath": "static/images/tabBar_sel1.png",
- "text": "首页"
- },
- {
- "pagePath": "pages/category/category",
- "iconPath": "static/images/tabBar2.png",
- "selectedIconPath": "static/images/tabBar_sel2.png",
- "text": "分类"
- },
- {
- "pagePath": "pages/index/image",
- "iconPath": "static/images/tabBarSns.png",
- "selectedIconPath": "static/images/tabBarSns_sel.png",
- "text": "发现"
- },
+ "list": [
+ {
+ "pagePath": "pages/index/index",
+ "iconPath": "static/images/tabBar1.png",
+ "selectedIconPath": "static/images/tabBar_sel1.png",
+ "text": "首页"
+ },
+ {
+ "pagePath": "pages/category/category",
+ "iconPath": "static/images/tabBar2.png",
+ "selectedIconPath": "static/images/tabBar_sel2.png",
+ "text": "分类"
+ },
+ {
+ "pagePath": "pages/index/image",
+ "iconPath": "static/images/tabBarSns.png",
+ "selectedIconPath": "static/images/tabBarSns_sel.png",
+ "text": "发现"
+ },
{
"pagePath": "pages/cart/cart",
"iconPath": "static/images/tabBar3.png",
diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue
index c3655c8..706b5d5 100644
--- a/pages/cart/cart.vue
+++ b/pages/cart/cart.vue
@@ -1,8 +1,12 @@
-
+
+
+ {{
+ !showDelList ? "管理" : "退出管理"
+ }}
@@ -362,7 +366,7 @@
@@ -558,7 +562,7 @@
@@ -749,7 +753,7 @@
{{ __("全选") }}
-
-
-
+
-
-
+
{{ sprintf(__("结算(%s)"), cartlist.Total) }}
+
+ 删除
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
- {{ __('品牌推荐') }}
-
- {{ item.category_name }}
+
+ {{ item.category_name }}
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
-
+
+ :url="
+ '/pages/product/list?category_id=' +
+ categoryFirst[curIndex].category_id +
+ '&cname=' +
+ categoryFirst[curIndex].category_name +
+ '&page_id=' +
+ categoryFirst[curIndex].page_id
+ "
+ class="m-cell m-cell-access"
+ style="padding: 30rpx 44rpx 10rpx"
+ hover-class="none"
+ >
- {{ __('全部分类') }}
+ {{ __("全部分类") }}
-
-
+
+
+ :url="
+ '/pages/product/list?category_id=' +
+ item.category_id +
+ '&cname=' +
+ item.category_name +
+ '&page_id=' +
+ item.page_id
+ "
+ class="m-cell m-cell-access"
+ style="margin-top: 0rpx"
+ hover-class="none"
+ >
{{ item.category_name }}
-
+
-
-
+ :url="
+ '/pages/product/list?category_id=' +
+ val.category_id +
+ '&cname=' +
+ val.category_name +
+ '&page_id=' +
+ val.page_id
+ "
+ hover-class="none"
+ >
+
+
{{ val.category_name }}
-
+
-
+
-
+ :url="
+ '/pages/product/list?brand_id=' +
+ brand.brand_id +
+ '&cname=' +
+ brand.brand_name +
+ '&page_id=' +
+ (brand.page_id || 0)
+ "
+ hover-class="none"
+ >
+
{{ brand.brand_name }}
@@ -128,13 +284,33 @@
-
+
-
-
+
+
-
+ :url="
+ '/pages/product/list?brand_id=' +
+ brand.brand_id +
+ '&cname=' +
+ brand.brand_name +
+ '&page_id=' +
+ (brand.page_id || 0)
+ "
+ hover-class="none"
+ >
+
{{ brand.brand_name }}
@@ -143,9 +319,8 @@
-
+
-
@@ -154,30 +329,37 @@
-
-
+
+
-
diff --git a/pages/index/index-single.vue b/pages/index/index-single.vue
index 73a5d18..ac1d5f3 100644
--- a/pages/index/index-single.vue
+++ b/pages/index/index-single.vue
@@ -389,7 +389,7 @@ export default {
current_currency: 86,
current_lang: "zh-CN",
current_img:
- "https://static.lancerdt.com/lancerdt/flags/square/5322affbc4d56.png",
+ "https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/lancerdt/flags/square/5322affbc4d56.png",
current_label: "中文",
};
},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 52e505b..ce0a866 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -27,7 +27,7 @@
:style="{
background: PageNav.window.navigationBarBackgroundColor,
}"
- @click="handerSkipu"
+ @click="handerSkipuSelectShippingAddress"
>
{{ address }}
@@ -52,6 +52,7 @@
:rightWidth="rightWidth"
>
+
+
+
+ 超市入口
+
@@ -402,7 +413,7 @@
:y="initY"
>
@@ -497,7 +508,7 @@ export default {
current_lang: "zh-CN",
current_standard: true,
current_img:
- "https://static.lancerdt.com/lancerdt/flags/square/5322affbc4d56.png",
+ "https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/lancerdt/flags/square/5322affbc4d56.png",
current_label: "中文",
initX: "690",
@@ -519,6 +530,9 @@ export default {
borderColor: "#dfdfdf",
fontColor: "#fff",
backgroundColor: "transparent",
+ provinceData: [],
+ cityData: [],
+ areaData: [],
};
},
watch: {},
@@ -627,6 +641,7 @@ export default {
*/
onShow: function () {
let that = this;
+ this.getAppDistrict();
//that.$.isNull(that.plantformInfo) || uni.setNavigationBarTitle({title: that.plantformInfo.name});
//this.refresh || this.setData({refresh: true})
@@ -642,7 +657,7 @@ export default {
if (currentAddress) {
this.address = currentAddress.name;
} else {
- // that.isPhoneLocationEnabled();
+ that.isPhoneLocationEnabled();
}
that.resetLang();
@@ -725,11 +740,39 @@ export default {
"getUserInfo",
"showCartNum",
]),
- handerSkipu() {
+ handerSkipuSelectShippingAddress() {
uni.navigateTo({
url: "/address/selectShippingAddress",
});
},
+ getAppDistrict() {
+ let that = this;
+ // 读取地区数据 【为了不同项目的小程序包体大小考虑，这里不能直接把数据放前端，可以使用服务端缓存和浏览器与小程序的本地存储来优化】
+ let district_data = uni.getStorageSync("district_data");
+ if (!district_data) {
+ that.$.request({
+ url: that.cf.URL.getAppDistrict,
+ data: {},
+ loading: false,
+ ajaxCache: {
+ timeout: this.cf.CACHE_EXPIRE,
+ },
+ success: function (data, status, msg, code) {
+ if (status == 200) {
+ uni.setStorageSync("district_data", data);
+ that.setDistrictData(data);
+ }
+ },
+ });
+ } else {
+ that.setDistrictData(district_data);
+ }
+ },
+ setDistrictData(district_data) {
+ this.provinceData = district_data.provinceData;
+ this.cityData = district_data.cityData;
+ this.areaData = district_data.areaData;
+ },
isPhoneLocationEnabled() {
let _this = this;
// 获取用户手机系统信息
@@ -752,6 +795,7 @@ export default {
},
fail: (err) => {
console.log("用户手机系统信息获取失败", err);
+ debugger;
},
});
},
@@ -871,6 +915,17 @@ export default {
},
});
},
+ fuzzyMatch(shortStr, longStr) {
+ if (!shortStr || !longStr) {
+ console.log("找不到地址");
+ return;
+ }
+
+ const lowerShortStr = shortStr.toLowerCase();
+ const lowerLongStr = longStr.toLowerCase();
+
+ return lowerShortStr.includes(lowerLongStr);
+ },
getLocation() {
var that = this;
@@ -915,16 +970,34 @@ export default {
location = res.latitude + "," + res.longitude;
let BMap = new bmap.BMapWX({
- ak: "rr77afHlUOgaGEtp7z5sVdnjy0CIaIa1",
+ ak: "LkqqCMB1qZmjYEkzx0Y1PTfmAUrkWPog",
});
let fail = function (res) {
console.log("fail", res);
};
+ var city = {
+ label: "",
+ value: 0,
+ };
+
let success = function (res) {
console.log("结果地址", res);
+ let data = res.originalData.result.addressComponent;
+
that.address = res.originalData.result.sematic_description;
+
+ that.cityData.forEach((group) => {
+ group.forEach((group1) => {
+ let isFind = that.fuzzyMatch(group1.label, data.city);
+ if (isFind) {
+ city = group1;
+ }
+ });
+ });
+
+ uni.setStorageSync("district_id", city.value);
};
BMap.regeocoding({
@@ -1149,7 +1222,17 @@ export default {
ajaxCache: {
timeout: that.Config.CACHE_EXPIRE,
},
- success(data) {
+ success(data, msg, status) {
+ if (!data) {
+ if (status == 250) {
+ uni.showToast({
+ title: "shop/mobile/getCategoryMobileNav" + msg,
+ icon: "error",
+ duration: 500,
+ });
+ }
+ return;
+ }
let tmp = data.items;
tmp.unshift({
id: 0,
@@ -1350,8 +1433,15 @@ export default {
forceRefresh: force_refresh,
},
success: function (data, status, msg, code) {
+ if (status == 250) {
+ uni.showToast({
+ title: "shop/mobile/app" + msg,
+ icon: "error",
+ duration: 1000,
+ });
+ return;
+ }
uni.stopPullDownRefresh();
-
let tmp = that.swiperTabItems[index];
tmp = {
pageId: data.page_id,
@@ -1947,6 +2037,11 @@ export default {
}
});
},
+ handerSkipu() {
+ uni.navigateTo({
+ url: `/member/member/supermarketlList`,
+ });
+ },
},
};
@@ -2009,6 +2104,26 @@ export default {
white-space: nowrap;
}
+.supermarket-name {
+ color: hsl(190, 100%, 48%);
+ animation: animate 5s linear alternate infinite;
+}
+
+@keyframes animate {
+ 0%,
+ 30%,
+ 70% {
+ color: hsl(190, 80%, 50%);
+ text-shadow: none;
+ }
+ 20%,
+ 40%,
+ 80%,
+ 100% {
+ color: hsl(0, 0%, 100%);
+ }
+}
+
.input-view {
width: 92%;
display: flex;
@@ -2080,6 +2195,12 @@ export default {
transform: translate(40%, -20%);
}
+.supermarket-block {
+ display: flex;
+ align-items: center;
+ font-size: 14px;
+}
+
/* 弹出层形式的广告 */
.uni-banner {
width: 80%;
diff --git a/pages/index/list.vue b/pages/index/list.vue
index be8ad90..a5c7735 100644
--- a/pages/index/list.vue
+++ b/pages/index/list.vue
@@ -1,565 +1,781 @@
-
-
-
-
-
-
-
- {{ current_label }}
-
-
-
- {{ city }}
-
-
-
-
-
-
-
-
-
-
- {{newMsgNum}}
-
-
-
-
-
- {{tab.category_alias || tab.category_name || " "}}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ {{ current_label }}
+
+
+
+ {{ city }}
+
+
+
+
+
+
+
+
+
+
+ {{ newMsgNum }}
+
+
+
+
+
+ {{ tab.category_alias || tab.category_name || " " }}
+
+
+
+
+
+
+
-
- {{tab.loadingText || __('加载中....')}}
-
-
-
-
-
+
+ {{ tab.loadingText || __("加载中....") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ __("语言选择") }}
+
+
+
+
+
+
+
+ {{
+ __("汇率选择")
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
- {{__('语言选择')}}
-
-
-
-
-
-
-
- {{__('汇率选择')}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ✕
-
-
-
+
+
+
+
+ ✕
+
+
+
diff --git a/pages/index/member.vue b/pages/index/member.vue
index 2d1cc02..0aa4dc1 100644
--- a/pages/index/member.vue
+++ b/pages/index/member.vue
@@ -1,1172 +1,1725 @@
-
-
-
-
-
-
-
-
-
-
-
- {{__('已签到')}}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ {{ __("已签到") }}
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
- {{__('登录／注册')}}
-
-
-
-
+
+
+
+
+
+ {{ __("登录／注册") }}
+
+
+
+
-
-
-
-
-
- {{userInfo.user_nickname}}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ userInfo.user_nickname }}
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- {{number_format(userInfo.user_money, 2) || 0}}
-
-
- {{__('余额')}}
-
-
-
-
- {{number_format(userInfo.commission_amount, 0) || 0}}
-
-
- {{__('佣金')}}
-
-
-
-
- {{number_format(userInfo.user_points, 0) || 0}}
-
-
- {{__('积分')}}
-
-
-
-
- {{number_format(userInfo.voucher, 0) || 0}}
-
-
- {{__('优惠券')}}
-
-
-
+
+
+
+ {{ number_format(userInfo.user_money, 2) || 0 }}
+
+
+ {{ __("余额") }}
+
+
+
+
+ {{ number_format(userInfo.commission_amount, 0) || 0 }}
+
+
+ {{ __("佣金") }}
+
+
+
+
+ {{
+ number_format(userInfo.user_points, 0) || 0
+ }}
+
+
+
+ {{ __("积分") }}
+
+
+
+
+ {{ number_format(userInfo.voucher, 0) || 0 }}
+
+
+ {{ __("优惠券") }}
+
+
+
-
-
-
- PLUS会员
- 自购省推广赚
-
+
+
+
+ PLUS会员
+ 自购省推广赚
+
-
- 开通Plus
-
-
+
+ 开通Plus
+
+
+
+
+
+ PLUS会员
+ 2020/12/31到期
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ __("待支付") }}
+
+
+
+ {{ __("待发货") }}
+
+
+
+ {{ __("待收货") }}
+
+
+
+
+ {{ __("已完成") }}
+
+
+
+ {{ __("全部订单") }}
+
+
-
-
-
- PLUS会员
- 2020/12/31到期
-
-
- 会员中心
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ __("待支付") }}
+
+
+
+
+
+
+
+
+
+ {{ __("待发货") }}
+
+
+
+
+
+
+
+
+
+ {{ __("待收货") }}
+
+
+
+
+
+
+
+
+
+ {{ __("已完成") }}
+
+
+
+
+
+
+
-
-
-
-
-
-
-
- {{__('待支付')}}
-
-
-
- {{__('待发货')}}
-
-
-
- {{__('待收货')}}
-
-
-
-
- {{__('已完成')}}
-
-
-
- {{__('全部订单')}}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ __("待支付") }}
+
+
+
+
+
+
+
+
+
+ {{ __("待发货") }}
+
+
+
+
+
+
+
+
+
+ {{ __("待收货") }}
+
+
+
+
+
+
+
+
+
+ {{ __("已完成") }}
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{__('待支付')}}
-
-
-
-
-
-
-
-
-
- {{__('待发货')}}
-
-
-
-
-
-
-
-
-
- {{__('待收货')}}
-
-
-
-
-
-
-
-
-
- {{__('已完成')}}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ __("待支付") }}
+
+
+
+
+
+
+
+
+
+ {{ __("待服务") }}
+
+
+
+
+
+
+
+
+
+ {{ __("待确认") }}
+
+
+
+
+
+
+
+
+
+ {{ __("已完成") }}
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{__('待支付')}}
-
-
-
-
-
-
-
-
-
- {{__('待发货')}}
-
-
-
-
-
-
-
-
-
- {{__('待收货')}}
-
-
-
-
-
-
-
-
-
- {{__('已完成')}}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ __("发布采购") }}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{__('待支付')}}
-
-
-
-
-
-
-
-
-
- {{__('待服务')}}
-
-
-
-
-
-
-
-
-
- {{__('待确认')}}
-
-
-
-
-
-
-
-
-
- {{__('已完成')}}
-
-
-
-
-
-
+
+
+
+
+
+ {{ __("我的采购") }}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{__('发布采购')}}
-
-
-
+
+
+
+
+
+ {{ __("我的报价") }}
+
+
+
+
+
+
+
+
-
-
-
-
-
- {{__('我的采购')}}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
- {{__('我的报价')}}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+ {{ __("积分商城") }}
+
+
+
+
-
+
+
+
+
+
+ {{ __("发布需求") }}
+
+
+
-
-
-
+
+
+
+
+
+ {{ __("我的需求") }}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ __("我的任务") }}
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
- {{__('积分商城')}}
-
-
-
-
+
+
+
+
+
+ {{ __("积分商城") }}
+
+
+
+
-
-
-
-
-
- {{__('发布需求')}}
-
-
-
+
+
+
+
+
+ {{ __("发布需求") }}
+
+
+
-
-
-
-
-
- {{__('我的需求')}}
-
-
-
+
+
+
+
+
+ {{ __("我的需求") }}
+
+
+
+
+
+
+
+
+ {{ __("我的任务") }}
+
+
+
+
+
+
+
-
-
-
-
-
- {{__('我的任务')}}
-
-
-
+
-
-
-
+
+
+
+
+ {{ __("商城套件系统提供技术支持") }} {{ versionNumber }}
+
+
+ {{ versionName }}{{ versionNumber }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{__('积分商城')}}
-
-
-
-
-
-
-
-
-
-
- {{__('发布需求')}}
-
-
-
-
-
-
-
-
-
- {{__('我的需求')}}
-
-
-
-
-
-
-
-
-
-
- {{__('我的任务')}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{__('商城套件系统提供技术支持')}} {{versionNumber}}
-
-
- {{versionName}}{{versionNumber}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{__('绑定手机号')}}
- {{__('您当前尚未绑定手机号，建议您绑定以获得更多优惠资讯')}}
-
-
- {{__('取消')}}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ {{ __("绑定手机号") }}
+ {{
+ __("您当前尚未绑定手机号，建议您绑定以获得更多优惠资讯")
+ }}
+
+
+ {{ __("取消") }}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/video-swipe.nvue b/pages/index/video-swipe.nvue
index d128a9d..0d542f9 100644
--- a/pages/index/video-swipe.nvue
+++ b/pages/index/video-swipe.nvue
@@ -5,26 +5,26 @@
-
+
+
-
+
{{item.story_like_count||1}}
-
+
分享
-
+
@{{item.user_nickname}}-{{i}}++{{k-i}}
diff --git a/pages/index/vip.vue b/pages/index/vip.vue
index 0eceabc..1e0825c 100644
--- a/pages/index/vip.vue
+++ b/pages/index/vip.vue
@@ -1,380 +1,689 @@
-
-
-
-
-
-
-
-
- {{message.user_growth}}
- {{__('成长值')}}
-
-
- {{number_format(message.user_money, 2)}}
- {{__('余额')}}
-
-
- {{message.voucher}}
- {{__('优惠券')}}
-
-
- {{number_format(message.user_points)}}
- {{__('积分')}}
-
-
+
+
+
+
+
+
+
+
+ {{ message.user_growth }}
+ {{ __("成长值") }}
+
+
+ {{ number_format(message.user_money, 2) }}
+ {{ __("余额") }}
+
+
+ {{ message.voucher }}
+ {{ __("优惠券") }}
+
+
+ {{ number_format(message.user_points) }}
+ {{ __("积分") }}
+
+
+
+
+ 会员权益
+
+
-
-
- 会员权益
-
-
+
+ 尊敬的会员，您现在无会员折扣可以使用。
+
+
+
+ 尊敬的会员，您在购物时可享受{{
+ message.user_level_rate / 10
+ }}折优惠
+
+
+
+
+
+ 任务中心
+
+
+
+
+
+ 签到领积分
+
+
+ 已签到
+
+
+
+
+
+ 购物领积分
+
+ 去购物
+
+
+
+
+
+ 评价领积分
+
+ 去评价
+
+
+
+
+ {{ signMsg }}
+
+
+ {{ __("抱歉！今日您已签到") }}
+ {{ __("~明天再来哦~") }}
+
+
+
-
- 尊敬的会员，您现在无会员折扣可以使用。
-
-
-
- 尊敬的会员，您在购物时可享受{{message.user_level_rate/10}}折优惠
-
-
-
-
-
- 任务中心
-
-
-
-
-
- 签到领积分
-
-
- 已签到
-
-
-
-
-
- 购物领积分
-
- 去购物
-
-
-
-
-
- 评价领积分
-
- 去评价
-
-
-
-
- {{signMsg}}
-
-
- {{__('抱歉！今日您已签到')}}
- {{__('~明天再来哦~')}}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -383,636 +692,635 @@
@import "../../styles/_variables";
.header {
- width: 100%;
- background: #db384c;
+ width: 100%;
+ background: #db384c;
}
.header-top {
- width: 100%;
- height: 529rpx;
- background: #db384c;
- justify-content: left;
+ width: 100%;
+ height: 529rpx;
+ background: #db384c;
+ justify-content: left;
}
.cover {
- position: fixed;
- width: 100%;
- height: 100%;
- top: 0px;
- background: rgba(0, 0, 0, 0.4);
- overflow: hidden;
+ position: fixed;
+ width: 100%;
+ height: 100%;
+ top: 0px;
+ background: rgba(0, 0, 0, 0.4);
+ overflow: hidden;
}
.butoo {
- background-color: #f7f7f7;
- width: 200px;
- color: red;
- text-align: left;
- padding-left: 5px;
- margin-top: 0px;
- margin-left: 15px;
+ background-color: #f7f7f7;
+ width: 200px;
+ color: red;
+ text-align: left;
+ padding-left: 5px;
+ margin-top: 0px;
+ margin-left: 15px;
}
/* .message { margin-top: 30rpx; } */
.grade {
- font-size: 28rpx;
- color: #fff;
- text-align: center;
- padding: 49rpx 0 0 20rpx
+ font-size: 28rpx;
+ color: #fff;
+ text-align: center;
+ padding: 49rpx 0 0 20rpx;
}
.header-top image {
- width: 118rpx;
- height: 118rpx;
- border-radius: 50%;
+ width: 118rpx;
+ height: 118rpx;
+ border-radius: 50%;
}
.header-bottom {
- width: 94%;
- height: 120rpx;
- background: #fff;
- padding: 20rpx 0;
- display: flex;
- margin: 0 auto;
- border-radius: 21rpx;
- position: absolute;
- top: 38%;
- left: 3%;
- box-shadow: 0 8px 8px rgba(0, 0, 0, 0.048)
+ width: 94%;
+ height: 120rpx;
+ background: #fff;
+ padding: 20rpx 0;
+ display: flex;
+ margin: 0 auto;
+ border-radius: 21rpx;
+ position: absolute;
+ top: 38%;
+ left: 3%;
+ box-shadow: 0 8px 8px rgba(0, 0, 0, 0.048);
}
.growth {
- width: 50%;
- font-size: 28rpx;
- color: #fff;
- text-align: center;
- margin-top: 4%;
+ width: 50%;
+ font-size: 28rpx;
+ color: #fff;
+ text-align: center;
+ margin-top: 4%;
}
.integral {
- width: 50%;
- font-size: 28rpx;
- color: #fff;
- text-align: center;
- margin-top: 4%;
+ width: 50%;
+ font-size: 28rpx;
+ color: #fff;
+ text-align: center;
+ margin-top: 4%;
}
.num {
- margin-bottom: 10rpx;
- color: #DB384C;
- font-family: Tahoma-Bold;
- font-size: 26rpx;
+ margin-bottom: 10rpx;
+ color: #db384c;
+ font-family: Tahoma-Bold;
+ font-size: 26rpx;
}
.prerogative {
- margin-top: 20rpx;
- padding: 45rpx 0 20rpx 0;
- background: #fff;
+ margin-top: 20rpx;
+ padding: 45rpx 0 20rpx 0;
+ background: #fff;
}
.prerogative-top {
- border-left: 6rpx solid #fff;
- font-size: 28rpx;
- height: 28rpx;
- margin-left: 5%;
- line-height: 28rpx;
+ border-left: 6rpx solid #fff;
+ font-size: 28rpx;
+ height: 28rpx;
+ margin-left: 5%;
+ line-height: 28rpx;
}
.prerogative1 {
- padding: 0 0 50rpx 0;
- background: #fff;
+ padding: 0 0 50rpx 0;
+ background: #fff;
}
.prerogative-bottom {
- font-size: 26rpx;
- height: 28rpx;
- margin-left: 7%;
- color: #9B9B9B;
+ font-size: 26rpx;
+ height: 28rpx;
+ margin-left: 7%;
+ color: #9b9b9b;
}
.color {
- width: 106rpx;
- height: 48rpx;
- display: flex;
- justify-content: center;
- line-height: 48rpx;
- font-size: 24rpx;
- background: rgb(160, 160, 160);
- color: #fff;
- border-radius: 10rpx;
+ width: 106rpx;
+ height: 48rpx;
+ display: flex;
+ justify-content: center;
+ line-height: 48rpx;
+ font-size: 24rpx;
+ background: rgb(160, 160, 160);
+ color: #fff;
+ border-radius: 10rpx;
}
/* .mission{ padding: 26rpx 0; border-top:1px solid #d9d9d9; position: relative; background: #fff; display: flex; justify-content: space-between; align-items: center } .mission::before{ content:" "; position:absolute; top:0; right:0; height:1px; border-top:1px solid #ebebe7; color:#ebebe7; -webkit-transform-origin:0 0; transform-origin:0 0; -webkit-transform:scaleY(0.5); transform:scaleY(0.5); } */
.mission {
- padding: 20rpx 0rpx;
- display: -webkit-box;
- position: relative;
- display: -webkit-flex;
- display: flex;
- -webkit-box-align: center;
- -webkit-align-items: center;
- align-items: center;
- justify-content: space-between;
- background: #fff;
- width: 85%;
- margin: 0 auto;
+ padding: 20rpx 0rpx;
+ display: -webkit-box;
+ position: relative;
+ display: -webkit-flex;
+ display: flex;
+ -webkit-box-align: center;
+ -webkit-align-items: center;
+ align-items: center;
+ justify-content: space-between;
+ background: #fff;
+ width: 85%;
+ margin: 0 auto;
}
.mission::before {
- content: " ";
- position: absolute;
- left: 0;
- top: 0;
- right: 0;
- height: 1px;
- border-top: 1px solid #f1f1f1;
- color: #d9d9d9;
- -webkit-transform-origin: 0 0;
- transform-origin: 0 0;
- -webkit-transform: scaleY(0.5);
- transform: scaleY(0.5);
+ content: " ";
+ position: absolute;
+ left: 0;
+ top: 0;
+ right: 0;
+ height: 1px;
+ border-top: 1px solid #f1f1f1;
+ color: #d9d9d9;
+ -webkit-transform-origin: 0 0;
+ transform-origin: 0 0;
+ -webkit-transform: scaleY(0.5);
+ transform: scaleY(0.5);
}
.button {
- width: 106rpx;
- height: 48rpx; /* text-align: center; */
- display: flex;
- justify-content: center;
- line-height: 48rpx;
- font-size: 24rpx;
- background: #db384c;
- color: #fff;
- border-radius: 10rpx;
+ width: 106rpx;
+ height: 48rpx; /* text-align: center; */
+ display: flex;
+ justify-content: center;
+ line-height: 48rpx;
+ font-size: 24rpx;
+ background: #db384c;
+ color: #fff;
+ border-radius: 10rpx;
}
.draw {
- font-size: 28rpx;
- height: 40rpx;
- line-height: 40rpx;
- display: flex;
- align-items: center;
+ font-size: 28rpx;
+ height: 40rpx;
+ line-height: 40rpx;
+ display: flex;
+ align-items: center;
}
.draw image {
- width: 40rpx;
- height: 40rpx;
+ width: 40rpx;
+ height: 40rpx;
}
.draw text {
- margin-left: 20rpx;
+ margin-left: 20rpx;
}
.alert {
- font-size: 32rpx;
- width: 70%;
- height: 200rpx;
- position: absolute;
- left: 15%;
- top: 40%;
- background: #fff;
- border-radius: 10rpx;
- justify-content: center;
- display: flex;
- align-items: center;
+ font-size: 32rpx;
+ width: 70%;
+ height: 200rpx;
+ position: absolute;
+ left: 15%;
+ top: 40%;
+ background: #fff;
+ border-radius: 10rpx;
+ justify-content: center;
+ display: flex;
+ align-items: center;
}
.alert1 {
- font-size: 32rpx;
- width: 70%;
- height: 200rpx;
- position: absolute;
- left: 15%;
- top: 40%;
- background: #fff;
- border-radius: 10rpx;
- justify-content: center;
- display: flex;
- flex-flow: column;
- align-items: center;
+ font-size: 32rpx;
+ width: 70%;
+ height: 200rpx;
+ position: absolute;
+ left: 15%;
+ top: 40%;
+ background: #fff;
+ border-radius: 10rpx;
+ justify-content: center;
+ display: flex;
+ flex-flow: column;
+ align-items: center;
}
.u-back2 image {
- border-radius: 100%;
- width: 77rpx;
- height: 77rpx;
- border: 1px solid #eee;
- font-size: 20rpx;
- text-align: center;
- background-color: #fff;
- box-shadow: 0px 4rpx 8rpx rgba(0, 0, 0, 0.35);
- z-index: 999;
- opacity: 0.8;
- line-height: 77rpx;
- margin-bottom: 20rpx;
+ border-radius: 100%;
+ width: 77rpx;
+ height: 77rpx;
+ border: 1px solid #eee;
+ font-size: 20rpx;
+ text-align: center;
+ background-color: #fff;
+ box-shadow: 0px 4rpx 8rpx rgba(0, 0, 0, 0.35);
+ z-index: 999;
+ opacity: 0.8;
+ line-height: 77rpx;
+ margin-bottom: 20rpx;
}
.wx_kb {
- width: 100%;
- text-align: right;
- position: absolute;
- top: 1%;
- right: 3%;
+ width: 100%;
+ text-align: right;
+ position: absolute;
+ top: 1%;
+ right: 3%;
}
.if_carh {
- height: 205rpx;
+ height: 205rpx;
}
.if_carh1 {
- width: 100%;
- height: 223rpx;
- background: #db384c;
- justify-content: left;
+ width: 100%;
+ height: 223rpx;
+ background: #db384c;
+ justify-content: left;
}
.if_carh2 {
- background: #fcf3f4;
+ background: #fcf3f4;
}
.if_carh3 {
- background: #fff;
+ background: #fff;
}
.if_carh4 {
- position: absolute;
- top: 17%;
- left: 3%;
- width: 94%;
- height: 153rpx;
- background: #fff;
- padding: 20rpx 0;
- display: flex;
- margin: 0 auto;
- border-radius: 21rpx;
- box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1)
+ position: absolute;
+ top: 17%;
+ left: 3%;
+ width: 94%;
+ height: 153rpx;
+ background: #fff;
+ padding: 20rpx 0;
+ display: flex;
+ margin: 0 auto;
+ border-radius: 21rpx;
+ box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
}
.if_carh5 {
- background: #fff;
+ background: #fff;
}
.card_vip {
- width: 100%;
- height: 253rpx;
+ width: 100%;
+ height: 253rpx;
}
.show_card {
- width: 91%;
- height: 192rpx;
- border-top-left-radius: 10px;
- border-top-right-radius: 10px;
- margin: 0 auto
+ width: 91%;
+ height: 192rpx;
+ border-top-left-radius: 10px;
+ border-top-right-radius: 10px;
+ margin: 0 auto;
}
.name_card {
- float: left;
- color: white;
- line-height: 102rpx;
- font-size: 24rpx;
+ float: left;
+ color: white;
+ line-height: 102rpx;
+ font-size: 24rpx;
}
.num_card {
- color: white;
- line-height: 75rpx;
- font-size: 32rpx;
+ color: white;
+ line-height: 75rpx;
+ font-size: 32rpx;
}
.overbalance {
- width: 100%;
- margin: 22rpx auto;
- box-sizing: border-box;
- background: #fff;
+ width: 100%;
+ margin: 22rpx auto;
+ box-sizing: border-box;
+ background: #fff;
}
.overbalanceTitle {
- width: 100%;
- height: 88rpx;
- font-family: PingFangSC-Medium;
- font-size: 26rpx;
- color: #000;
- font-weight: 500;
- line-height: 37rpx;
- padding-top: 27rpx;
- padding-bottom: 24rpx;
- box-sizing: border-box; /* letter-spacing: 0; */
- background: #fff;
- box-shadow: 0 2rpx 0 0 #efefef;
- padding-right: 24rpx;
+ width: 100%;
+ height: 88rpx;
+ font-family: PingFangSC-Medium;
+ font-size: 26rpx;
+ color: #000;
+ font-weight: 500;
+ line-height: 37rpx;
+ padding-top: 27rpx;
+ padding-bottom: 24rpx;
+ box-sizing: border-box; /* letter-spacing: 0; */
+ background: #fff;
+ box-shadow: 0 2rpx 0 0 #efefef;
+ padding-right: 24rpx;
}
.overbalanceTitle image {
- width: 23rpx;
- height: 26rpx;
- margin-right: 15rpx;
+ width: 23rpx;
+ height: 26rpx;
+ margin-right: 15rpx;
}
.overbalanceConversion {
- width: 100%;
- height: 469rpx;
- padding: 30rpx;
- box-sizing: border-box;
- white-space: nowrap;
- display: flex;
+ width: 100%;
+ height: 469rpx;
+ padding: 30rpx;
+ box-sizing: border-box;
+ white-space: nowrap;
+ display: flex;
}
.everyConversion {
- display: inline-block;
- width: 300rpx;
- height: 430rpx;
- margin-right: 20rpx;
- padding: 20rpx 25rpx 34rpx;
- box-sizing: border-box;
- background: #fff;
- box-shadow: 0 5rpx 10rpx 0 rgba(0, 0, 0, 0.06);
- border-radius: 8rpx;
+ display: inline-block;
+ width: 300rpx;
+ height: 430rpx;
+ margin-right: 20rpx;
+ padding: 20rpx 25rpx 34rpx;
+ box-sizing: border-box;
+ background: #fff;
+ box-shadow: 0 5rpx 10rpx 0 rgba(0, 0, 0, 0.06);
+ border-radius: 8rpx;
}
.everyConversion .moreCoupon {
- width: 250rpx;
- height: 250rpx;
- background-image: linear-gradient(-225deg, #f87c5e 0%, #db384c 100%);
- margin-bottom: 24rpx;
- border-radius: 8rpx;
- text-align: center;
- box-sizing: border-box;
- font-size: 24rpx;
- line-height: 33rpx;
- padding-top: 55rpx;
- color: #fff;
+ width: 250rpx;
+ height: 250rpx;
+ background-image: linear-gradient(-225deg, #f87c5e 0%, #db384c 100%);
+ margin-bottom: 24rpx;
+ border-radius: 8rpx;
+ text-align: center;
+ box-sizing: border-box;
+ font-size: 24rpx;
+ line-height: 33rpx;
+ padding-top: 55rpx;
+ color: #fff;
}
.moreCoupon view:first-child {
- width: 100%;
- height: 90rpx;
- margin: 0 auto;
- text-align: center;
- font-size: 40rpx;
+ width: 100%;
+ height: 90rpx;
+ margin: 0 auto;
+ text-align: center;
+ font-size: 40rpx;
}
.moreCoupon view:first-child text {
- font-size: 64rpx;
- line-height: 90rpx;
+ font-size: 64rpx;
+ line-height: 90rpx;
}
.moreCoupon view:last-child {
- width: 100%;
- text-align: center;
- padding: 0 10rpx;
- box-sizing: border-box;
- word-wrap: break-word;
- white-space: pre-wrap;
+ width: 100%;
+ text-align: center;
+ padding: 0 10rpx;
+ box-sizing: border-box;
+ word-wrap: break-word;
+ white-space: pre-wrap;
}
.everyConversion image {
- display: block;
- width: 250rpx;
- height: 250rpx;
- margin-bottom: 24rpx;
+ display: block;
+ width: 250rpx;
+ height: 250rpx;
+ margin-bottom: 24rpx;
}
.everyConversion .titel {
- display: block;
- width: 100%;
- font-family: PingFangSC-Regular;
- font-size: 24rpx;
- line-height: 33rpx;
- color: #000; /* letter-spacing: 0; */
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- margin-bottom: 19rpx;
+ display: block;
+ width: 100%;
+ font-family: PingFangSC-Regular;
+ font-size: 24rpx;
+ line-height: 33rpx;
+ color: #000; /* letter-spacing: 0; */
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ margin-bottom: 19rpx;
}
.everyConversion .integralBtn {
- display: flex;
- align-items: center;
- justify-content: space-between;
- margin: 0;
- padding: 0;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ margin: 0;
+ padding: 0;
}
.everyConversion .integralBtn text {
- font-family: PingFangSC-Semibold;
- font-size: 28rpx;
- line-height: 40rpx;
- color: #db384c; /* letter-spacing: 0; */
+ font-family: PingFangSC-Semibold;
+ font-size: 28rpx;
+ line-height: 40rpx;
+ color: #db384c; /* letter-spacing: 0; */
}
.everyConversion .integralBtn button {
- width: 100rpx;
- height: 50rpx;
- background: #db384c;
- border-radius: 10rpx;
- font-family: PingFangSC-Regular;
- font-size: 24rpx;
- color: #fff; /* letter-spacing: 0; */
- padding: 0;
- margin: 0;
- line-height: 50rpx;
+ width: 100rpx;
+ height: 50rpx;
+ background: #db384c;
+ border-radius: 10rpx;
+ font-family: PingFangSC-Regular;
+ font-size: 24rpx;
+ color: #fff; /* letter-spacing: 0; */
+ padding: 0;
+ margin: 0;
+ line-height: 50rpx;
}
.m-listv {
- margin-top: 20rpx;
- background: #f8f8f8;
- padding: 0 4rpx 0 16rpx;
- overflow: hidden;
+ margin-top: 20rpx;
+ background: #f8f8f8;
+ padding: 0 4rpx 0 16rpx;
+ overflow: hidden;
}
.recommend {
- text-align: center;
- padding: 20rpx 0;
- color: #DB384c;
- font-size: 30rpx;
- font-weight: bold
+ text-align: center;
+ padding: 20rpx 0;
+ color: #db384c;
+ font-size: 30rpx;
+ font-weight: bold;
}
.m-listv .m-product-item {
- margin: 10rpx;
- width: 345rpx;
- height: 520rpx;
- overflow: hidden;
- float: left;
- border-radius: 8rpx;
- background-color: #fff;
+ margin: 10rpx;
+ width: 345rpx;
+ height: 520rpx;
+ overflow: hidden;
+ float: left;
+ border-radius: 8rpx;
+ background-color: #fff;
}
.m-listv .m-product-img {
- width: 345rpx;
- height: 345rpx;
- float: left;
- text-align: center;
+ width: 345rpx;
+ height: 345rpx;
+ float: left;
+ text-align: center;
}
.m-product-img image {
- width: 100%;
- height: 100%;
- box-sizing: border-box;
- padding: 20rpx;
+ width: 100%;
+ height: 100%;
+ box-sizing: border-box;
+ padding: 20rpx;
}
.m-product-info {
- height: 210rpx;
- width: 538rpx;
- float: left;
- box-sizing: border-box;
- padding: 20rpx 0;
- position: relative;
+ height: 210rpx;
+ width: 538rpx;
+ float: left;
+ box-sizing: border-box;
+ padding: 20rpx 0;
+ position: relative;
}
.m-listv .m-product-name {
- width: 345rpx;
- height: 100rpx;
- box-sizing: border-box;
- padding: 10rpx 20rpx;
- font-size: 28rpx;
- line-height: 40rpx;
- position: relative;
+ width: 345rpx;
+ height: 100rpx;
+ box-sizing: border-box;
+ padding: 10rpx 20rpx;
+ font-size: 28rpx;
+ line-height: 40rpx;
+ position: relative;
}
.m-product-name label {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-box-orient: vertical;
- -webkit-line-clamp: 2;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
}
.m-listv .m-product-price {
- padding: 0 20rpx;
- font-size: 32rpx;
- line-height: 40rpx;
- color: #DB384C;
+ padding: 0 20rpx;
+ font-size: 32rpx;
+ line-height: 40rpx;
+ color: #db384c;
}
.m-product-price label {
- font-size: 24rpx;
+ font-size: 24rpx;
}
.msk2 {
- position: fixed;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- background-color: rgba(0, 0, 0, 0.5);
- z-index: 10;
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0, 0, 0, 0.5);
+ z-index: 10;
}
.m-coupon-box {
- background-color: #db384c;
- padding: 10rpx 25rpx 35rpx 25rpx;
- border-radius: 35rpx;
- width: 62%;
- margin: 25% auto;
+ background-color: #db384c;
+ padding: 10rpx 25rpx 35rpx 25rpx;
+ border-radius: 35rpx;
+ width: 62%;
+ margin: 25% auto;
}
.coupon_title {
- font-size: 52rpx;
- color: #fff;
- margin: 30rpx auto;
- text-align: center;
- letter-spacing: 3rpx;
+ font-size: 52rpx;
+ color: #fff;
+ margin: 30rpx auto;
+ text-align: center;
+ letter-spacing: 3rpx;
}
.coupon_back {
- width: 468rpx;
- height: 450rpx;
+ width: 468rpx;
+ height: 450rpx;
}
.shopbox {
- display: flex;
- align-items: center;
- padding: 28rpx 48rpx 22rpx 38rpx;
+ display: flex;
+ align-items: center;
+ padding: 28rpx 48rpx 22rpx 38rpx;
}
.shop_name {
- font-size: 28rpx;
+ font-size: 28rpx;
}
.context_box {
- margin: 10rpx auto 0;
- display: flex;
- align-items: center;
- color: #db384c;
+ margin: 10rpx auto 0;
+ display: flex;
+ align-items: center;
+ color: #db384c;
}
.left {
- margin-right: 20rpx;
- text-align: center;
- width: 30%;
- max-width: 45%;
- overflow: hidden;
+ margin-right: 20rpx;
+ text-align: center;
+ width: 30%;
+ max-width: 45%;
+ overflow: hidden;
}
.left2 {
- margin-right: 20rpx;
- text-align: center;
- width: 35%;
- max-width: 50%;
- overflow: hidden;
- line-height: 53px;
- font-size: 38rpx;
+ margin-right: 20rpx;
+ text-align: center;
+ width: 35%;
+ max-width: 50%;
+ overflow: hidden;
+ line-height: 53px;
+ font-size: 38rpx;
}
.right {
- margin: auto 0;
- overflow: hidden;
+ margin: auto 0;
+ overflow: hidden;
}
.youhuiquan {
- border-bottom: 1rpx solid #db384c;
- overflow: hidden;
- height: 47rpx;
- max-width: 280rpx;
- line-height: 43rpx;
- white-space: nowrap;
- text-overflow: ellipsis;
+ border-bottom: 1rpx solid #db384c;
+ overflow: hidden;
+ height: 47rpx;
+ max-width: 280rpx;
+ line-height: 43rpx;
+ white-space: nowrap;
+ text-overflow: ellipsis;
}
.manjian {
- max-width: 306rpx;
- line-height: 50rpx;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
+ max-width: 306rpx;
+ line-height: 50rpx;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
}
.youxiaoqi {
- font-size: 24rpx;
- color: #999;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- padding-top: 22rpx; /* text-align: center; */
- padding-left: 38rpx;
+ font-size: 24rpx;
+ color: #999;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ padding-top: 22rpx; /* text-align: center; */
+ padding-left: 38rpx;
}
.lijishiyong_box {
- width: 100%;
- background: #fff;
- display: flex;
- align-items: center;
- justify-content: center;
+ width: 100%;
+ background: #fff;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
.lijishiyong {
- width: 250rpx;
- height: 60rpx;
- background-color: #db384c;
- color: #fff;
- border-radius: 35rpx;
- letter-spacing: 4rpx;
- text-align: center;
- font-size: 28rpx;
- line-height: 60rpx;
- margin-top: 32rpx;
+ width: 250rpx;
+ height: 60rpx;
+ background-color: #db384c;
+ color: #fff;
+ border-radius: 35rpx;
+ letter-spacing: 4rpx;
+ text-align: center;
+ font-size: 28rpx;
+ line-height: 60rpx;
+ margin-top: 32rpx;
}
.close_msk1 {
- display: flex;
- justify-content: center;
- align-items: center;
- margin-top: 124rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin-top: 124rpx;
}
-
diff --git a/pages/index/vv.nvue b/pages/index/vv.nvue
index 3a06308..5559f29 100644
--- a/pages/index/vv.nvue
+++ b/pages/index/vv.nvue
@@ -35,14 +35,14 @@
+
-
+
{{item.story_like_count}}
-
+
{{item.story_comment_count}}
-
+
分享
-
+
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 26638a7..269104d 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,51 +1,90 @@
-
+
-
-
+
+
-
-
+
-
+
-
+
-
+
-
+
diff --git a/pages/product/list.vue b/pages/product/list.vue
index bbc6960..711d115 100644
--- a/pages/product/list.vue
+++ b/pages/product/list.vue
@@ -125,7 +125,7 @@
:y="returnPos.initY"
>
diff --git a/pages/video/video.nvue b/pages/video/video.nvue
index e3bf069..f30508d 100644
--- a/pages/video/video.nvue
+++ b/pages/video/video.nvue
@@ -56,9 +56,9 @@
-
+
-
+
{{item.story_like_count}}
@@ -68,7 +68,7 @@
-
+
{{item.story_comment_count}}
@@ -77,7 +77,7 @@
{{item.story_comment_count}}
-
+
{{__('分享')}}
@@ -88,7 +88,7 @@
-
+
diff --git a/pagesub/index/store.vue b/pagesub/index/store.vue
index e1c689a..72d498b 100644
--- a/pagesub/index/store.vue
+++ b/pagesub/index/store.vue
@@ -1,1349 +1,1752 @@
-
-
-
-
-
-
-
-
-
-
-
- {{store_info.store_name}}
-
-
- {{__('综合体验')}}
-
-
-
-
- {{store_info.store_grade_name}}
- {{sprintf(__('公告：%s'), store_info.store_slogan)}}
+
+
+
+
+
+
+
+
+
+
+ {{ store_info.store_name }}
+
+
+ {{ __("综合体验") }}
+
+
+
+
+ {{
+ store_info.store_grade_name
+ }}
+ {{ sprintf(__("公告：%s"), store_info.store_slogan) }}
+
+
+
-
-
-
+
+
+
+
-
+
+
-
-
-
+
+
+
+
+
+
+
+ {{ __("推荐") }}
+
+
+ {{ commonTPL.shopInfo.AllProduct }}
+ {{ __("全部商品") }}
+
+
+ {{ commonTPL.shopInfo.NewProduct }}
+ {{ __("上新") }}
+
+
+
+
+
+ {{ __("店铺简介") }}
+
+
+
+
+
+ {{ __("供应商") }}
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
- {{__('推荐')}}
-
-
- {{commonTPL.shopInfo.AllProduct}}
- {{__('全部商品')}}
-
-
- {{commonTPL.shopInfo.NewProduct}}
- {{__('上新')}}
-
-
-
-
-
- {{__('店铺简介')}}
-
-
-
-
-
- {{__('供应商')}}
-
-
+
+
+
+
+
+
+
+ {{ __("销量") }}
+
+
+ {{ __("新品") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ number_format(item.ItemSalePrice, 2) }}
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ __("正在加载") }}
+
+
+
+
+ {{
+ __("没有更多数据啦！")
+ }}
+
+
+
+
+
+
-
-
-
-
-
-
-
- {{__('销量')}}
-
-
- {{__('新品')}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{number_format(item.ItemSalePrice, 2)}}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ number_format(item.ItemSalePrice, 2) }}
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{__('正在加载')}}
-
-
-
-
- {{__('没有更多数据啦！')}}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ __("正在加载") }}
+
+
+
+
+ {{
+ __("没有更多数据啦！")
+ }}
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{number_format(item.ItemSalePrice, 2)}}
-
+
+
+
+
+
+
+
+ {{
+ commonTPL.shopInfo.LegalAdress
+ }}
+ {{ sprintf(__("距您 %s"), distance) }}
+
+
+
+
+
+
-
-
-
-
+
+
+
+ {{ __("联系商家") }}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{__('正在加载')}}
-
-
-
-
- {{__('没有更多数据啦！')}}
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
- {{commonTPL.shopInfo.LegalAdress}}
- {{sprintf(__('距您 %s'), distance)}}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- {{__('联系商家')}}
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+ {{ __("我也说两句~") }}
+ {{ __("去评论~") }}
+
+
+
+
+
+
+
+
+
+ {{ __("暂时没有评论哦~") }}
+ {{ __("去评论~") }}
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{__('我也说两句~')}}
- {{__('去评论~')}}
-
-
-
-
-
-
-
-
-
- {{__('暂时没有评论哦~')}}
- {{__('去评论~')}}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/pagesub/info/edit.vue b/pagesub/info/edit.vue
index 0c65e07..4d06890 100644
--- a/pagesub/info/edit.vue
+++ b/pagesub/info/edit.vue
@@ -1,467 +1,507 @@
-
-
- 内容：
-
-
-
-
-
- 关键字：
-
-
-
-
-
- 分类：
-
-
-
-
-
- 区域：
-
-
-
-
-
- 省/市/区：
-
-
-
-
-
- 详细地址：
-
-
-
-
-
- 联系人：
-
-
-
-
-
- 手机号：
-
-
-
-
-
-
- 图片：
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 内容：
+
+
+
+
+
+ 关键字：
+
+
+
+
+
+ 分类：
+
+
+
+
+
+ 区域：
+
+
+
+
+
+ 省/市/区：
+
+
+
+
+
+ 详细地址：
+
+
+
+
+
+ 联系人：
+
+
+
+
+
+ 手机号：
+
+
+
+
+
+
+ 图片：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pagesub/login/login.vue b/pagesub/login/login.vue
index 89c5cb4..5d68c4b 100644
--- a/pagesub/login/login.vue
+++ b/pagesub/login/login.vue
@@ -1,86 +1,112 @@
-
-
-
-
-
- {{__('使用微信头像、昵称授权注册')}}
+
+
+
+
+
+ {{ __("使用微信头像、昵称授权注册") }}
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/pagesub/login/reg.vue b/pagesub/login/reg.vue
index bcf0f89..5597d2c 100644
--- a/pagesub/login/reg.vue
+++ b/pagesub/login/reg.vue
@@ -1,305 +1,406 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{btntext}}
- {{btntext}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ btntext
+ }}
+ {{ btntext }}
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pagesub/login/register.vue b/pagesub/login/register.vue
index 06ab95f..b9c65bf 100644
--- a/pagesub/login/register.vue
+++ b/pagesub/login/register.vue
@@ -1,285 +1,315 @@
-
+
+
+
+
+
+
+
-
-
-
-
-
-
+
-
+
+
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{__('企业证书')}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{industry[index].industry_name}}
-
-
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+ {{ __("企业证书") }}
+
+
+
+
+
+
+
+
+
+
+ {{ industry[index].industry_name }}
+
+
+
+
-
-
-
-
-
-
-
-
+
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
diff --git a/pagesub/login/sms.vue b/pagesub/login/sms.vue
index 6a444e6..4fa2122 100644
--- a/pagesub/login/sms.vue
+++ b/pagesub/login/sms.vue
@@ -1,287 +1,293 @@
-
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
diff --git a/pagesub/search/search1.vue b/pagesub/search/search1.vue
index 964f955..2ef823f 100644
--- a/pagesub/search/search1.vue
+++ b/pagesub/search/search1.vue
@@ -1,235 +1,392 @@
-
-
-
-
-
- 搜索
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{key}}
-
-
-
-
-
- {{key}}
-
-
- 当前搜热门搜索已隐藏
-
-
-
-
-
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ key }}
+
+
+
+
+
+ {{ key }}
+
+
+ 当前搜热门搜索已隐藏
+
+
+
+
+
diff --git a/plant/plant/common/server.js b/plant/plant/common/server.js
index 4b10829..e26c4b0 100644
--- a/plant/plant/common/server.js
+++ b/plant/plant/common/server.js
@@ -1,6 +1,6 @@
var HOST="http://127.0.0.1/project/xyx/";
var API_HOST=HOST+"/api/";
-var CDN_HOST="https://static.lancerdt.com/plant/";
+var CDN_HOST="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/plant/";
var session_id;
diff --git a/plant/plant/common/utils.js b/plant/plant/common/utils.js
index eccc7d9..e1cad21 100644
--- a/plant/plant/common/utils.js
+++ b/plant/plant/common/utils.js
@@ -189,7 +189,7 @@ function play_mp3(url){
}
function play_sfx(sfx_name,delay=0){
function do_sfx(){
- var sfx=play_mp3("https://static.lancerdt.com/plant/static/sounds/"+sfx_name+".mp3");
+ var sfx=play_mp3("https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/plant/static/sounds/"+sfx_name+".mp3");
sfx.volume=.5;
}
diff --git a/plant/plant/components/ezguide.vue b/plant/plant/components/ezguide.vue
index c41def0..e1c9b8c 100644
--- a/plant/plant/components/ezguide.vue
+++ b/plant/plant/components/ezguide.vue
@@ -1,134 +1,238 @@
-
-
-
-
-
-
-
-
-
-
- {{guides[guide_index].text}}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{ guides[guide_index].text }}
+
+
+
+
diff --git a/plant/plant/index.vue b/plant/plant/index.vue
index 7e42c35..3564ef1 100644
--- a/plant/plant/index.vue
+++ b/plant/plant/index.vue
@@ -1,53 +1,211 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 当前稀有度加成
- {{plant_rare}}%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{is_fans?'我的粉丝':'全部排名'}}
- 全部排名
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 当前稀有度加成
+ {{ plant_rare }}%
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ is_fans ? "我的粉丝" : "全部排名" }}
+ 全部排名
+
-
-
-
-
-
-
-
- {{index+1}}
-
-
-
-
-
- {{item.nickname}}
-
-
- {{item.coin}}
-
-
- 声望: {{item.prestige}}
-
-
-
-
-
-
-
-
-
- {{myrank}}
-
-
-
-
-
- {{owner_info.nickname}}
-
-
- {{owner_info.coin}}
-
-
-
-
-
-
- 没有新的活动
-
-
-
-
-
-
-
-
-
-
-
-
- 成熟时间：{{detail_seed.growduration/3600}}小时
- 标准产量：{{detail_seed.quantity}}
- 出售单价：{{detail_seed.unitprice}}
- 预期总收入：{{detail_seed.quantity*detail_seed.unitprice}}
- 稀有等级：{{["普通","稀有","极稀有"][detail_seed.rare]}}
-
-
- 生长阶段
-
-
-
- {{["发芽","幼苗","小苗","开花","结果"][index]}}
-
-
-
-
-
-
-
- {{item.gotit?item.type_cn:['普通','未解锁','未解锁'][item.rare]}}
-
-
-
-
-
-
-
-
-
- {{item.type_cn}}
- {{item.effect}}
-
-
- {{item.price}}
-
-
-
-
-
-
-
-
-
- 加速30分钟
- 愿意看广告的人先致富
-
-
- 立即加速
- 需观看视频广告
-
-
-
-
-
-
-
- 加速60分钟
- 俗话说朋友多了路好走
-
-
- 邀请好友
-
-
-
-
-
-
-
- 加速5小时
- 有钱就是可以为所欲为
-
-
- 立即购买
-
- 2000
-
-
-
-
-
-
- 瓷猪储蓄罐 升级
- 最大存储{{bank.capacity}}，每30分钟+{{bank.growcoin}}
-
-
-
- 余额提出
- {{bank.coin}}阳光值
-
-
-
-
-
-
-
- 最近来访
- 最近来访
- 访问过的
- 访问过的
- →
- 邀请好友
-
-
- 空空如也
-
-
-
-
-
- {{item.nickname}}
- {{time_distance(item.createtime)}}来过{{item.msg!=""?("，"+item.msg):""}}
-
-
- 访问
-
-
-
-
- 空空如也
-
-
-
-
-
- {{item.nickname}}
- {{time_distance(item.createtime)}}去过{{item.msg!=""?("，"+item.msg):""}}
-
-
- 访问
-
-
-
-
-
-
- 花盆
- 花盆
- 汽车
- 汽车
- 其它
- 其它
-
-
- 空空如也
-
-
-
-
- 使用中
-
-
-
-
-
- {{item.effect=="无"?"":item.effect}}
-
-
- {{item.name}}
-
-
- 已拥有
-
-
- {{item.price}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 优惠购买
- 领取200元优惠券
-
-
-
-
- 立即登录
- 已有账户可直接登录
-
-
-
-
-
-
- 仓库
- 仓库
- 汽车
- 汽车
-
-
- 今日市场涨跌幅：{{quotation>0?'+'+quotation+'%':quotation+'%'}}
-
- 空空如也
-
-
-
- {{item.type_cn}}
-
-
-
- 单价：{{item.unitprice}}
- 库存：{{item.quantity}}
-
-
-
- -
-
- {{item.sale_quantity?item.sale_quantity:0}}
-
- +
-
-
-
-
- 出售
-
-
-
-
-
-
- 小汽车可向粉丝仓库运送水果
-
-
- 请前往商店购买
-
-
-
-
-
-
-
-
-
-
-
- 还没有
- 小汽车
-
-
-
-
-
-
-
- 还没有
- 小汽车
-
-
- 将自己仓库中的收获转送给好友
-
- 空空如也
-
-
-
- {{item.type_cn}}
-
-
-
- 单价：{{item.unitprice}}
- 库存：{{item.quantity}}
-
-
-
- -
-
- {{item.sale_quantity?item.sale_quantity:0}}
-
- +
-
-
-
-
- 送出
-
-
-
-
-
-
-
-
-
-
-
- {{diary.date_fmt}}
- 第{{diary.daycount}}天
-
-
-
- 今天的总收入为{{diary.totalincome}}，总支出为{{diary.totalspend}}。访问了{{diary.visitcount}}名好友。有点犯懒，没有访问过任何好友。有{{diary.bevisitcount}}名好友来访问了我。没有好友来看我，感觉有点冷清。
-
-
- 访客记录
-
- {{time_format(item.createtime)}} {{item.nickname}} {{item.msg}}
-
-
-
- 消费记录
-
- {{time_format(item.createdate)}} {{item.msg}} {{item.value}}
-
-
-
- 收入记录
-
- {{time_format(item.createdate)}} {{item.msg}} +{{item.value}}
-
-
-
-
-
-
- 向前一天
-
-
-
-
- 向后一天
-
-
-
-
-
-
-
- {{rolling_buff.title}}
-
- +
- {{rolling_buff.current}}%
-
-
- 停止
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
- {{owner_info.nickname}}
-
- {{owner_info.coin}}
- 转出
-
-
-
-
-
+
+
+
+
+
+ {{ owner_info.nickname }}
+
+ {{ owner_info.coin }}
+ 转出
+
+
+
+
+
-
-
-
-
-
-
-
-
- {{effects_cfg.name}}
- x{{effects_cfg.quantity}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 播种
-
-
-
-
-
- 施肥
-
-
-
-
-
- 除虫
-
-
-
-
-
- 浇水
-
-
-
-
-
- 采摘
-
-
-
-
-
-
-
- {{plant.type_cn}}
- 预计收成：{{plant_calc_vgain}}%
- 缺水有虫
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 距收获{{gain_plant_distance_cn}}
- 加速
-
-
-
-
- 最近访客查看更多
- 新访客将增加阳光值和声望
-
-
-
-
-
- 立即邀请
-
-
-
-
-
-
- {{item.nickname}}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ 距收获{{ gain_plant_distance_cn }}
+ 加速
+
+
+
+
+ 最近访客查看更多
+ 新访客将增加阳光值和声望
+
+
+
+
+
+ 立即邀请
+
+
+
+
+
+
+ {{ item.nickname }}
+
+
+
+
+
+
+
diff --git a/seller/index/index.vue b/seller/index/index.vue
index 488372c..baa650f 100644
--- a/seller/index/index.vue
+++ b/seller/index/index.vue
@@ -1,209 +1,349 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {{orders.yestoday_num}}
- {{__('昨日订单数')}}
-
-
- {{orders.month_num}}
- {{__('当月订单数')}}
-
-
-
- {{orders.pay_amount}}
- {{__('成交总金额')}}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ orders.yestoday_num }}
+ {{ __("昨日订单数") }}
+
+
+ {{ orders.month_num }}
+ {{ __("当月订单数") }}
+
+
+
+ {{ orders.pay_amount }}
+ {{ __("成交总金额") }}
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ __("待付款") }}
+
+
+
+
+ {{ __("待发货") }}
+
-
-
-
-
-
- {{__('待付款')}}
-
-
-
-
- {{__('待发货')}}
-
+
+
+
+ {{ __("已发货") }}
+
-
-
-
- {{__('已发货')}}
-
+
+
+
+ {{ __("已完成") }}
+
+
+
+
+ {{ __("已取消") }}
+
+
+
+
-
-
-
- {{__('已完成')}}
-
-
-
-
- {{__('已取消')}}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ __("出售中") }}
+
+
+
+
+ {{ __("仓库中") }}
+
-
-
-
-
-
- {{__('出售中')}}
-
-
-
-
- {{__('仓库中')}}
-
+
+
+
+ {{ __("违规商品") }}
+
+
+
+ {{ __("发布商品") }}
+
+
+
+
-
-
-
- {{__('违规商品')}}
-
-
-
- {{__('发布商品')}}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- {{__('商城套件系统提供技术支持')}} {{versionNumber}}
-
-
- {{versionName}}{{versionNumber}}
-
-
-
-
- {{__('绑定手机号')}}
- {{__('您当前尚未绑定手机号，建议您绑定以获得更多优惠资讯')}}
-
-
- {{__('取消')}}
-
-
-
-
-
-
+
+
+
+
+ {{ __("商城套件系统提供技术支持") }} {{ versionNumber }}
+
+
+ {{ versionName }}{{ versionNumber }}
+
+
+
+
+ {{ __("绑定手机号") }}
+ {{
+ __("您当前尚未绑定手机号，建议您绑定以获得更多优惠资讯")
+ }}
+
+
+ {{ __("取消") }}
+
+
+
+
+
@@ -474,122 +647,122 @@ export default {
diff --git a/seller/product/sale.vue b/seller/product/sale.vue
index 8dc28c1..6f44e5f 100644
--- a/seller/product/sale.vue
+++ b/seller/product/sale.vue
@@ -1,1332 +1,1360 @@
-
-
-
-
-
-
-
-
- {{UserInfo.user_mobile}}
-
-
+
+
+
+
+
+
+
+
+ {{ UserInfo.user_mobile }}
+
+
+
+
-
-
+
+
+
+
+
+
+
+ {{ __("搜索") }}
+
-
-
-
-
-
-
-
- {{__('搜索')}}
-
+
+
+
+
+ {{ __("全部") }}
+
+
+
+
+ {{ val.category_name }}
+
+
+
+
+
+
+
+
+ {{ category.category_name }}
+
+
+
+
+
-
-
-
-
- {{__('全部')}}
-
-
-
-
- {{val.category_name}}
-
-
-
-
-
-
-
-
- {{category.category_name}}
-
-
-
-
-
+
+
+
+
+
+ ![]()
+
+
+
+ {{ items.item_name }}
+
+
+ {{ __("￥") }}{{ items.item_unit_price }}
+ {{ __("库存") }}：{{ items.item_quantity }}
+
+
+
+
+
+
+
-
-
-
-
-
- ![]()
-
-
-
- {{items.item_name}}
-
-
- {{__('￥')}}{{items.item_unit_price}}
- {{__('库存')}}：{{items.item_quantity}}
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ __("正在加载") }}
+
+
+
+
+
+
+
+ {{ __("没有更多数据啦！") }}
+
+
+
+
+
+
+
+
+
+ {{ __("亲~找不到您想要的商品") }}
+
+
+
-
-
-
-
-
- {{__('正在加载')}}
-
-
-
-
-
-
-
- {{__('没有更多数据啦！')}}
-
-
-
-
-
-
-
-
-
- {{__('亲~找不到您想要的商品')}}
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{user.user_account}}
- {{user.user_nickname}}
- {{user.user_mobile}}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{ user.user_account }}
+ {{ user.user_nickname }}
+ {{ user.user_mobile }}
+
+
+
+
+
+
+
+
+
diff --git a/seller/user/cart.vue b/seller/user/cart.vue
index 369dc48..c101e6d 100644
--- a/seller/user/cart.vue
+++ b/seller/user/cart.vue
@@ -673,7 +673,7 @@
-
+
{{user.user_account}}
diff --git a/static/emoji/emojiData.js b/static/emoji/emojiData.js
index 9d1a664..ce540a1 100644
--- a/static/emoji/emojiData.js
+++ b/static/emoji/emojiData.js
@@ -51,7 +51,7 @@ var emojiData = {
{ url: '18.gif', alt: '[抓狂]' },
{ url: '19.gif', alt: '[吐]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
@@ -76,7 +76,7 @@ var emojiData = {
{ url: '38.gif', alt: '[敲打]' },
{ url: '39.gif', alt: '[再见]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: '40.gif', alt: '[擦汗]' },
@@ -100,7 +100,7 @@ var emojiData = {
{ url: '58.gif', alt: '[篮球]' },
{ url: '59.gif', alt: '[乒乓]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: '60.gif', alt: '[咖啡]' },
@@ -124,7 +124,7 @@ var emojiData = {
{ url: '78.gif', alt: '[拥抱]' },
{ url: '79.gif', alt: '[强]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: '80.gif', alt: '[弱]' },
@@ -148,7 +148,7 @@ var emojiData = {
{ url: '98.gif', alt: '[跳绳]' },
{ url: '99.gif', alt: '[投降]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: '100.gif', alt: '[激动]' },
@@ -157,7 +157,7 @@ var emojiData = {
{ url: '103.gif', alt: '[左太极]' },
{ url: '104.gif', alt: '[右太极]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
]
]
},
@@ -166,7 +166,7 @@ var emojiData = {
emojiName:"huoxinList",
emojiSort:2,
minEmoji:true,
- emojiPath:"https://static.lancerdt.com/xcxfile/appicon/im/img/huoxin/",
+ emojiPath:"https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/huoxin/",
emojiList: [
[
{ url: 'q_000.png', alt: '[测试1]' },
@@ -190,7 +190,7 @@ var emojiData = {
{ url: 'q_018.png', alt: '[]' },
{ url: 'q_019.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'q_020.png', alt: '[]' },
@@ -214,7 +214,7 @@ var emojiData = {
{ url: 'q_038.png', alt: '[]' },
{ url: 'q_039.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'q_040.png', alt: '[]' },
@@ -238,7 +238,7 @@ var emojiData = {
{ url: 'q_058.png', alt: '[]' },
{ url: 'q_059.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'q_060.png', alt: '[]' },
@@ -262,7 +262,7 @@ var emojiData = {
{ url: 'q_078.png', alt: '[]' },
{ url: 'q_079.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'q_080.png', alt: '[]' },
@@ -285,7 +285,7 @@ var emojiData = {
{ url: 'q_097.png', alt: '[]' },
{ url: 'q_098.png', alt: '[]' },
{ url: 'q_099.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'q_101.png', alt: '[]' },
@@ -308,7 +308,7 @@ var emojiData = {
{ url: 'q_118.png', alt: '[]' },
{ url: 'q_119.png', alt: '[]' },
{ url: 'q_120.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'q_121.png', alt: '[]' },
@@ -331,7 +331,7 @@ var emojiData = {
{ url: 'q_138.png', alt: '[]' },
{ url: 'q_139.png', alt: '[]' },
{ url: 'q_140.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'q_141.png', alt: '[]' },
@@ -354,7 +354,7 @@ var emojiData = {
{ url: 'q_158.png', alt: '[]' },
{ url: 'q_159.png', alt: '[]' },
{ url: 'q_160.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'q_161.png', alt: '[]' },
@@ -367,7 +367,7 @@ var emojiData = {
{ url: 'q_168.png', alt: '[]' },
{ url: 'q_169.png', alt: '[]' },
{ url: 'q_170.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
]
]
},
@@ -376,7 +376,7 @@ var emojiData = {
emojiName:"dingdingList",
emojiSort:2,
minEmoji:true,
- emojiPath:"https://static.lancerdt.com/xcxfile/appicon/im/img/dingding/",
+ emojiPath:"https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/dingding/",
emojiList: [
[
{ url: 'emotion_001.png', alt: '[微笑]' },
@@ -399,7 +399,7 @@ var emojiData = {
{ url: 'emotion_018.png', alt: '[抱拳]' },
{ url: 'emotion_019.png', alt: '[握手]' },
{ url: 'emotion_020.png', alt: '[OK]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'emotion_021.png', alt: '[]' },
@@ -422,7 +422,7 @@ var emojiData = {
{ url: 'emotion_038.png', alt: '[]' },
{ url: 'emotion_039.png', alt: '[]' },
{ url: 'emotion_040.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'emotion_041.png', alt: '[]' },
@@ -445,7 +445,7 @@ var emojiData = {
{ url: 'emotion_058.png', alt: '[]' },
{ url: 'emotion_059.png', alt: '[]' },
{ url: 'emotion_060.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'emotion_061.png', alt: '[]' },
@@ -468,7 +468,7 @@ var emojiData = {
{ url: 'emotion_078.png', alt: '[]' },
{ url: 'emotion_079.png', alt: '[]' },
{ url: 'emotion_080.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'emotion_081.png', alt: '[]' },
@@ -491,7 +491,7 @@ var emojiData = {
{ url: 'emotion_098.png', alt: '[]' },
{ url: 'emotion_099.png', alt: '[]' },
{ url: 'emotion_100.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'emotion_101.png', alt: '[]' },
@@ -514,7 +514,7 @@ var emojiData = {
{ url: 'emotion_118.png', alt: '[]' },
{ url: 'emotion_119.png', alt: '[]' },
{ url: 'emotion_120.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: 'emotion_121.png', alt: '[]' },
@@ -537,7 +537,7 @@ var emojiData = {
{ url: 'emotion_138.png', alt: '[]' },
{ url: 'emotion_139.png', alt: '[]' },
{ url: 'emotion_140.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
]
]
},
@@ -546,7 +546,7 @@ var emojiData = {
emojiName:"douyinList",
emojiSort:3,
minEmoji:true,
- emojiPath:"https://static.lancerdt.com/xcxfile/appicon/im/img/douyin/",
+ emojiPath:"https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/douyin/",
emojiList: [
[
{ url: '0.png', alt: '[抖音1]' },
@@ -570,7 +570,7 @@ var emojiData = {
{ url: '18.png', alt: '[]' },
{ url: '19.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: '20.png', alt: '[]' },
@@ -594,7 +594,7 @@ var emojiData = {
{ url: '38.png', alt: '[]' },
{ url: '39.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: '40.png', alt: '[]' },
@@ -618,7 +618,7 @@ var emojiData = {
{ url: '58.png', alt: '[]' },
{ url: '59.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: '60.png', alt: '[]' },
@@ -641,7 +641,7 @@ var emojiData = {
{ url: '77.png', alt: '[]' },
{ url: '78.png', alt: '[]' },
{ url: '79.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: '80.png', alt: '[]' },
@@ -665,7 +665,7 @@ var emojiData = {
{ url: '98.png', alt: '[]' },
{ url: '99.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: '100.png', alt: '[]' },
@@ -689,7 +689,7 @@ var emojiData = {
{ url: '118.png', alt: '[]' },
{ url: '119.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: '120.png', alt: '[]' },
@@ -713,12 +713,12 @@ var emojiData = {
{ url: '138.png', alt: '[]' },
{ url: '139.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
],
[
{ url: '140.png', alt: '[]' },
{ url: '141.png', alt: '[]' },
- { url: 'https://static.lancerdt.com/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
+ { url: 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/tab/delete2.png', alt: '[删除]' }
]
]
},
@@ -726,7 +726,7 @@ var emojiData = {
emojiName:"ajmdList",
emojiSort:4,
minEmoji:false,
- emojiPath:"https://static.lancerdt.com/xcxfile/appicon/im/img/ajmd/",
+ emojiPath:"https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/ajmd/",
emojiList: [
[
{ url: '0.png', alt: '[ajmd1]' },
@@ -794,7 +794,7 @@ var emojiData = {
emojiName:"gongfuhuList",
emojiSort:5,
minEmoji:false,
- emojiPath:"https://static.lancerdt.com/xcxfile/appicon/im/img/gongfuhu/",
+ emojiPath:"https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/gongfuhu/",
emojiList: [
[
{ url: '0.gif', alt: '[]' },
@@ -841,7 +841,7 @@ var emojiData = {
emojiName:"xxyList",
emojiSort:6,
minEmoji: false,
- emojiPath:"https://static.lancerdt.com/xcxfile/appicon/im/img/xxy/",
+ emojiPath:"https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/xxy/",
emojiList: [
[
{ url: '0.png', alt: '[]' },
@@ -899,7 +899,7 @@ var emojiData = {
emojiName:"feineneList",
emojiSort:7,
minEmoji: false,
- emojiPath:"https://static.lancerdt.com/xcxfile/appicon/im/img/feinene/",
+ emojiPath:"https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/im/img/feinene/",
emojiList: [
[
{ url: '0.gif', alt: '[]' },
diff --git a/static/iconfont.ttf b/static/iconfont.ttf
index 0203fcb..6d894cb 100644
Binary files a/static/iconfont.ttf and b/static/iconfont.ttf differ
diff --git a/static/images/login-bg.png b/static/images/login-bg.png
new file mode 100644
index 0000000..3481111
Binary files /dev/null and b/static/images/login-bg.png differ
diff --git a/static/images/pay_type/offline.png b/static/images/pay_type/offline.png
deleted file mode 100644
index 7943745..0000000
Binary files a/static/images/pay_type/offline.png and /dev/null differ
diff --git a/static/images/qishou.png b/static/images/qishou.png
new file mode 100644
index 0000000..b69dbb5
Binary files /dev/null and b/static/images/qishou.png differ
diff --git a/store/index.js b/store/index.js
index 4cdbdec..f073c90 100644
--- a/store/index.js
+++ b/store/index.js
@@ -12,6 +12,7 @@ import $cookies from '../helpers/vue-cookies';
import Config from '../config/config'
import StateCode from '../config/statecode'
import Lang from '../config/lang'
+import { $loginPopup } from '../helpers/loginPopup.js'
import notice from '../helpers/notice'
@@ -31,7 +32,7 @@ const STATE_KEY = 'STATE_KEY';
var ret = uni.getStorageSync(USERS_KEY);
let default_user_info = {
user_nickname: Lang.__("未注册用户"),
- user_avatar: "https://static.lancerdt.com/demodata/assets/data/avatar.png",
+ user_avatar: "https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/demodata/assets/data/avatar.png",
user_is_new: 1
};
@@ -55,7 +56,7 @@ const store = new Vuex.Store({
cartList: [],
cartMap: {},
newMsgNum: 0,
-
+ showLoginPopup:false,
plantformInfo: {
return_state_list: [
{
@@ -203,12 +204,13 @@ const store = new Vuex.Store({
Lang: Lang
},
mutations: {
+ setShowLoginPopup(state,showLoginPopup){
+ state.showLoginPopup = Object.assign(state.showLoginPopup,showLoginPopup);
+ },
login(state, userInfo) {
- if ('user_avatar' in userInfo)
- {
- if (userInfo.user_avatar)
- {
+ if ('user_avatar' in userInfo){
+ if (userInfo.user_avatar){
if(state.Config.HTTPS && userInfo.user_avatar.indexOf("https") == 0)
{
}
@@ -233,44 +235,43 @@ const store = new Vuex.Store({
}
else
{
- userInfo.user_avatar = "https://static.lancerdt.com/demodata/assets/data/avatar.png";
+ userInfo.user_avatar = "https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/demodata/assets/data/avatar.png";
}
}
- userInfo = Object.assign(state.userInfo, userInfo);
+ userInfo = Object.assign(state.userInfo, userInfo);
state.userInfo = userInfo;
state.userName = userInfo.user_nickname || Lang.__('未注册用户');
state.hasLogin = true;
- //保存基本信息
- uni.setStorageSync(USERS_KEY, JSON.stringify(userInfo));
+ //保存基本信息
+ uni.setStorageSync(USERS_KEY, JSON.stringify(userInfo));
- //强制授权读取小程序或者公众号手机号
- if ('as' in userInfo)
- {
- if (userInfo.as)
- {
- }
- else
- {
- if (Config.FORCE_BIND_MOBILE)
- {
- setTimeout(()=>{
- $.confirm(Lang.__('绑定手机号码'),
- function(data) {
- if (data.confirm) {
- //绑定手机操作
- $.gopage("/member/member/bindphone");
- }
- },true);
- }, 2000)
- }
- }
+ //强制授权读取小程序或者公众号手机号
+ if ('as' in userInfo){
+ if (userInfo.as)
+ {
+ }
+ else
+ {
+ if (Config.FORCE_BIND_MOBILE)
+ {
+ // setTimeout(()=>{
+ // $.confirm(Lang.__('绑定手机号码'),
+ // function(data) {
+ // if (data.confirm) {
+ // //绑定手机操作
+ // $.gopage("/member/member/bindphone");
+ // }
+ // },true);
+ // }, 2000)
+ }
+ }
- }
+ }
},
logout(state, payload) {
if ($.source_data.source_type == StateCode.SOURCE_TYPE_APP)
@@ -306,65 +307,69 @@ const store = new Vuex.Store({
state.chatTolist={};///当前聊天对话的里面是聊天的对象和
state.currentChatPuid='';
- try {
- uni.closeSocket();
- } catch (s) {}
-
- if (payload)
- {
- $.toLogin(state.forcedLoginState);
- }
+ try {
+ uni.closeSocket();
+ } catch (s) {}
+
+ if (payload)
+ {
+ $.toLogin(state.forcedLoginState);
+ }
},
forceUserInfo(state, callback) {
- var that = this;
+ var that = this;
+ //记录来源页面
+ var pages = getCurrentPages();
+ var page = pages[pages.length - 1];
- //记录来源页面
- var pages = getCurrentPages();
- var page = pages[pages.length - 1];
+ //page.route != 'pagesub/login/login' && page.route != 'pages/index/member'
- //page.route != 'pagesub/login/login' && page.route != 'pages/index/member'
-
- if (page.route.indexOf("/login/") != -1) {
- uni.setStorageSync('pre_route', page.route);
- if (page.options) {
- uni.setStorageSync('pre_options', page.options);
- }
- }
-
- if (!state.hasLogin) {
- if (state.forcedLoginState)
- {
- $.toLogin(true);
- }
- else
- {
- $.showModal({
- title: Lang.__('未登录'),
- content: Lang.__('您未登录，需要登录后才能继续'),
- /**
- * 如果需要强制登录，不显示取消按钮
- */
- showCancel: !state.forcedLoginState,
- success: (res) => {
- if (res.confirm) {
- /**
- * 如果需要强制登录，使用reLaunch方式
- */
- $.toLogin(state.forcedLoginState);
- }
- else
- {
- uni.navigateBack();
- }
- }
- });
- }
+ if (page.route.indexOf("/login/") != -1) {
+ uni.setStorageSync('pre_route', page.route);
+ if (page.options) {
+ uni.setStorageSync('pre_options', page.options);
}
- else
- {
- //判断当前用户是否存在，不存在读取?
- callback && callback($.isEmptyObject(state.userInfo) ? null : state.userInfo);
+ }
+
+ if (!state.hasLogin) {
+
+ if (state.forcedLoginState){
+ $.toLogin(true);
}
+ else{
+
+ // #ifdef MP-WEIXIN
+
+ // #endif
+
+ // $loginPopup({show:true})
+ // this.commit("setShowLoginPopup",true);
+
+ // $.showModal({
+ // title: Lang.__('未登录'),
+ // content: Lang.__('您未登录，需要登录后才能继续'),
+ // /**
+ // * 如果需要强制登录，不显示取消按钮
+ // */
+ // showCancel: !state.forcedLoginState,
+ // success: (res) => {
+ // if (res.confirm) {
+ // /**
+ // * 如果需要强制登录，使用reLaunch方式
+ // */
+ // $.toLogin(state.forcedLoginState);
+ // }
+ // else{
+ // uni.navigateBack();
+ // }
+ // }
+ // });
+ }
+ }
+ else{
+ //判断当前用户是否存在，不存在读取?
+ callback && callback($.isEmptyObject(state.userInfo) ? null : state.userInfo);
+ }
},
setUserInfo: function (state, payload) {
state.userInfo = Object.assign(state.userInfo, payload);
@@ -427,7 +432,7 @@ const store = new Vuex.Store({
"RuleEnabled": false,
"VendorFeatureSet": '',
"ShopConfig": {
- "AppIconPath": "https://static.lancerdt.com/xcxfile/appicon/"
+ "AppIconPath": "https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/"
},
"store_star_num": data.analytics.store_evaluation_num ? (data.analytics.store_deliverycredit + data.analytics.store_deliverycredit + data.analytics.store_deliverycredit) / 3 / data.analytics.store_evaluation_num : 5,
"analytics": data.analytics,
@@ -968,9 +973,16 @@ const store = new Vuex.Store({
method: "GET",
data: param,
loading: false,
- success: function (data) {
+ success: function (data,status,msg) {
let cartMap = {};
-
+ if(status == 250){
+ uni.showToast({
+ title: "shop/userCart/lists" + msg,
+ icon: "error",
+ duration: 1000,
+ });
+ return;
+ }
//循环所有店铺
if (!$.isNull(data.items) && data.items.length > 0) {
let total = 0;
@@ -1014,13 +1026,14 @@ const store = new Vuex.Store({
async addCart({ state, commit }, provider) {
let that = this
-
+
await $.request({
url: Config.URL.cart.add,
method:'POST',
data: provider.params,
loading: false,
success: (data, status, msg, code) => {
+ console.log(status)
if (status == 200) {
commit("setCartNum", {
type: provider.params.cart_quantity >0 ? 'add' : 'sub',
@@ -1029,7 +1042,8 @@ const store = new Vuex.Store({
provider.callback && provider.callback(data, status, msg, code)
} else {
- $.alert(msg);
+ // $.alert(msg);
+ $.alert("点击太快了")
}
},
fail: (err) => {
diff --git a/styles/_variables.scss b/styles/_variables.scss
index 67c09d6..40a01f8 100644
--- a/styles/_variables.scss
+++ b/styles/_variables.scss
@@ -63,7 +63,7 @@ $brand-danger: #d9534f !default;
//## Settings for some of the most global styles.
//
-$body-bg: #f5f5f5 !default;
+$body-bg: #f4f4f4 !default;
// Global text color on ``.
$text-color: $gray-dark !default;
diff --git a/styles/iconfontAili.css b/styles/iconfontAili.css
index 92ed0c1..8a0312d 100644
--- a/styles/iconfontAili.css
+++ b/styles/iconfontAili.css
@@ -11,6 +11,26 @@
-moz-osx-font-smoothing: grayscale;
}
+.icon-weixin:before {
+ content: "\e600";
+}
+
+.icon-dianpu2:before {
+ content: "\e623";
+}
+
+.icon-wancheng:before {
+ content: "\e606";
+}
+
+.icon-yundianxiaochengxu2_tongchengpeisong:before {
+ content: "\e640";
+}
+
+.icon-money-cny-circle-fill:before {
+ content: "\e7cd";
+}
+
.icon-zengjiatianjiajiahao:before {
content: "\e62a";
}
@@ -42,4 +62,3 @@
.icon-dingwei:before {
content: "\e65f";
}
-
diff --git a/styles/layout.scss b/styles/layout.scss
index acaecf8..82c9dab 100644
--- a/styles/layout.scss
+++ b/styles/layout.scss
@@ -298,15 +298,15 @@
position: relative;
width: 40rpx;
height: 40rpx;
- background: url(https://static.lancerdt.com/xcxfile/appicon/pc1.png) center no-repeat;
+ background: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/pc1.png) center no-repeat;
background-size: cover;
}
.c2 {
position: relative;
- width: 50rpx;
- height: 50rpx;
- background: url(https://static.lancerdt.com/xcxfile/appicon/pc2.png) center no-repeat;
+ width: 56rpx;
+ height: 56rpx;
+ background: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/pc2.png) center no-repeat;
background-size: cover;
}
@@ -320,7 +320,7 @@
color: #fff;
font-size: 24rpx;
line-height: 50rpx;
- background: url(https://static.lancerdt.com/xcxfile/appicon/pc3.png) center no-repeat;
+ background: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/pc3.png) center no-repeat;
background-size: cover;
}
@@ -1167,7 +1167,7 @@
.coupon_item {
width: 110px;
height: 81px;
- background: url(https://static.lancerdt.com/xcxfile/appicon/coupon/coupon_bg.png) no-repeat center;
+ background: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/coupon/coupon_bg.png) no-repeat center;
background-size: cover;
color: #fff;
display: flex;
@@ -1225,7 +1225,7 @@
height: 208rpx;
margin: 8rpx 8rpx 0 0;
flex-shrink: 0;
- background: url(https://static.lancerdt.com/xcxfile/appicon/img/uploadimage.png) center no-repeat #bfbfbf;
+ background: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/img/uploadimage.png) center no-repeat #bfbfbf;
background-size: 150rpx;
}