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 0203fcbe44c834d92df03eb909a8f85d34c29bfb..6d894cb5a2823102e97017c1e2ff75d234074f76 100644
GIT binary patch
delta 1786
zcmaJ>ZERCj7=F*a?d{t2YisYl-P+#KkKKN;7W%!l#es7U-C&5*IMA(j9V^+oMM@~d
zq$LJ_7z48kM$y$3*E1c2$nLVoE|&GQ=o<3&{W%^#liU%Pn&Ky?K`H!@eu&xG8n
zkJ0xVL~;%lnj7p1<)y^~mFGrQegWv92flsjisybK5M&X;yYq25ghth`SCCt%8bX
z2o5l#Mz4UvDO$y@c$AS(o2t>=}ah{MV0W$buH5GQeTf
zb})bj^H+l&O&p&8WBDqht)YbLVv_>;VAK|9-U`%bqs0GXd=z~x+V-;#B6j0FMez^rq64tJ_fa${8?G|X_xSoeUNtj$BzcX{p
z3(Q3p*j3d@)g`qTZ5S4SU14s46J&_MFpR?_mKznrjK|GsINmA>q9%nzh(%L!B3|1<
zd{M#5x#f6LLkShsabK8t+!`aXN(B9qDbbfqC3~qoMjc}JIOepW!!UX5;oZjrL03c(^)Z?KVpj;%0}`sJ)@LSoG+5
zy4_-F?+^sWM6yq(AIM}!a*1eQZ-V6*6>;@!TO8cYyLrLIk0Ow}lZi*Ol5@5?n^CcC
z;nChuIf1^XEIun#~I@d$R#<8pH*rqu}{R*NQ65^0iVp~*y?
zjmua&C;Mcdk!ak_&4XKn$eVp`&Pl97%oW{266`87*q)N_zTcbBJxH{j*04Vo8nZh_
zC&ujdu~0nFXYCB~CKVTWqQ@giqrs5Z@9Y^1idKVzW7ue#MGG~f^G^g1@-@caAy
z^4+6Ox~pa8C!15Sb$2z+)PmA^dgu9`zzLf}Bo&j$wHX^@3w!=USLDm_7FCR&WjwU9gosVt@IVxL@eP+`7}O_=;32L
zMGRF8R0>1+^uRzmU-*7zx_@Axe|lzny*!!SGnv~{uGi}m_0T{+8VmV!CPTdn`ThY?
z4^8aJPNLUDXaX0&JDXG;+M1Ctge5AXCLGa_Hligu(oXcmK#ar$+@WHrS}JR1O8N5A
z!D!o|e7P`JEbsFkK3Jx@YAL_iR8$W}rz(r(eNADhSUP|_zpz*?9_}lY5v6Ae^Toc|
Z()_&j2%g_x%2)9C{?c;6uoXX(@E2jtdTamy
delta 555
zcmZvYu}fP~6vn@E-^NCojP&pG#e=iGZ6;~%rT59`BEPXKuh
z;CZPUgzwAKM}SI`)Z$X@<=0ng0C1-O?^&fByvTbStE~M)9#xn~{&u$MpORdqy1tpC
z!+sYwURo&yiKFBK^+Sv^)nGG}0knBO$arKqsFsJyJEjPvwm9%0Tv=PMU47R;_XrD`
zZ%)UaXb4@>{5790_RRc4m&*k3ckSKdo4wO;;WQZgP&P}mI*lE;tx@?Ty7fb5TRGKV
zZ$~Gg2~2E50j6vcQ%C>_JsXD3%kRVV(cH7;~2gLXXi0?
pbYvm+@I|yQKh<0H&6)Uo==bW37A20jk`Pal;)|9PT9bWq{{c3Ia5?}0
diff --git a/static/images/login-bg.png b/static/images/login-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..34811119c5c3728f1fbfc278e742e0f5b185afd1
GIT binary patch
literal 71510
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