From b859219268e3f815e6f6fe443ae5b64508bb29c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B5=A9?= <15830956848@163.com> Date: Mon, 21 Apr 2025 17:39:41 +0800 Subject: [PATCH] 4.21 --- App.vue | 14 +- TUIKit/components/TUIChat/index.vue | 3 +- api/common.js | 2 +- api/goods.js | 52 +- api/members.js | 22 + api/point.js | 24 +- api/trade.js | 15 + components/m-buy/goods.vue | 74 +- components/m-goods-recommend/index.vue | 2 +- components/m-share/index.vue | 61 +- config/api.js | 14 +- config/config.js | 3 +- main.js | 5 + pages.json | 70 +- pages/cart/payment/payOrder.vue | 1 - pages/mine/expert/index.vue | 333 ++++ pages/mine/invite.vue | 149 ++ pages/mine/inviteinput.vue | 91 ++ pages/mine/makeMoney/index.sass | 0 pages/mine/makeMoney/index.vue | 30 + pages/mine/myTracks.vue | 2 +- pages/mine/mydistribution/index.vue | 269 ++++ pages/mine/openShop/ThirdApply.vue | 323 ++++ pages/mine/openShop/index.vue | 431 +++++ pages/mine/openShop/secon.vue | 189 +++ pages/mine/set/feedBack.vue | 50 +- pages/mine/set/personMsg.vue | 557 ++++--- pages/mine/signIn.vue | 65 +- pages/navigation/search/searchPage.vue | 4 +- pages/order/evaluate/myEvaluate.vue | 2 +- pages/order/fillorder.vue | 2 + pages/passport/login.vue | 1410 +++++++++-------- pages/passport/static/logn.png | Bin 0 -> 22206 bytes pages/product/customerservice/index.vue | 2 + pages/product/goods.vue | 142 +- .../product/goods/-goods-recommend.vue | 5 +- pages/product/product/shop/-shop.vue | 34 +- pages/product/product/style.scss | 5 +- pages/product/shopPage.vue | 183 ++- pages/product/shopPageGoods.vue | 2 +- pages/product/vengoods.vue | 1154 ++++++++++++++ pages/tabbar/home/index.vue | 94 +- pages/tabbar/home/template/Talent.vue | 13 +- pages/tabbar/home/template/tpl.css | 31 + pages/tabbar/home/template/tpl.scss | 2 +- pages/tabbar/home/template/tpl_search.vue | 2 +- pages/tabbar/home/template/tpl_shop.vue | 37 +- pages/tabbar/home/views.vue | 96 +- pages/tabbar/home/web-view.vue | 1 + pages/tabbar/im/index.vue | 36 +- pages/tabbar/user/my.vue | 60 +- pages/tabbar/user/similarGoods.vue | 2 +- pages/tabbar/user/utils/tool.vue | 126 +- plugins/Reg/RegExp.js | 50 + static/abcx.png | Bin 0 -> 234470 bytes static/imlogo.png | Bin 0 -> 13161 bytes static/logn.png | Bin 0 -> 22206 bytes static/mine/Feedback.png | Bin 752 -> 3972 bytes static/mine/mon.png | Bin 0 -> 5948 bytes static/mine/mony.png | Bin 0 -> 7746 bytes static/mine/shop.png | Bin 0 -> 4337 bytes static/mine/smk.png | Bin 0 -> 7866 bytes static/mine/stion.png | Bin 0 -> 2995 bytes static/shop.png | Bin 1446 -> 7059 bytes uni.css | 152 ++ uni.scss | 44 +- utils/request.js | 346 ++-- 67 files changed, 5482 insertions(+), 1406 deletions(-) create mode 100644 pages/mine/expert/index.vue create mode 100644 pages/mine/invite.vue create mode 100644 pages/mine/inviteinput.vue create mode 100644 pages/mine/makeMoney/index.sass create mode 100644 pages/mine/makeMoney/index.vue create mode 100644 pages/mine/mydistribution/index.vue create mode 100644 pages/mine/openShop/ThirdApply.vue create mode 100644 pages/mine/openShop/index.vue create mode 100644 pages/mine/openShop/secon.vue create mode 100644 pages/passport/static/logn.png create mode 100644 pages/product/vengoods.vue create mode 100644 pages/tabbar/home/template/tpl.css create mode 100644 plugins/Reg/RegExp.js create mode 100644 static/abcx.png create mode 100644 static/imlogo.png create mode 100644 static/logn.png create mode 100644 static/mine/mon.png create mode 100644 static/mine/mony.png create mode 100644 static/mine/shop.png create mode 100644 static/mine/smk.png create mode 100644 static/mine/stion.png create mode 100644 uni.css diff --git a/App.vue b/App.vue index b7b6629f..e4986507 100644 --- a/App.vue +++ b/App.vue @@ -225,10 +225,10 @@ export default { }, }; - - \ No newline at end of file + diff --git a/config/api.js b/config/api.js index 19d7df32..ee3aca24 100644 --- a/config/api.js +++ b/config/api.js @@ -7,19 +7,19 @@ const dev = { // common: "https://common-api.pickmall.cn", // buyer: "https://buyer-api.pickmall.cn", - common: "http://192.168.1.200:8890", - buyer: "http://192.168.1.200:8888", - vlog: "http://192.168.1.200:8099", - web: "http://192.168.1.200:8099", + common: "http://192.168.1.211:8890", + buyer: "http://192.168.1.211:8888", + vlog: "http://192.168.1.211:8099", + web: "http://192.168.1.211:8099", }; // 生产环境 const prod = { // common: "https://common-api.pickmall.cn", // buyer: "https://buyer-api.pickmall.cn", - common: "http://192.168.1.200:8890", - buyer: "http://192.168.1.200:8888", - vlog: "http://192.168.1.200:8099", + common: "http://192.168.1.211:8890", + buyer: "http://192.168.1.211:8888", + vlog: "http://192.168.1.211:8099", }; //默认生产环境 diff --git a/config/config.js b/config/config.js index 807b63c3..a00cd30b 100644 --- a/config/config.js +++ b/config/config.js @@ -12,5 +12,6 @@ export default { iosAppId:"id1564638363", //AppStore的应用地址id 具体在分享->拷贝链接中查看 logo:"https://lilishop-oss.oss-cn-beijing.aliyuncs.com/4c864e133c2944efad1f7282ac8a3b9e.png", //logo地址 customerServiceMobile:"13161366885", //客服电话 - customerServiceEmail:"lili@lili.com" //客服邮箱 + customerServiceEmail:"lili@lili.com", //客服邮箱 + img:'https://wzjbucket.oss-rg-china-mainland.aliyuncs.com', //图片地址,聊天分享的图片地址 }; diff --git a/main.js b/main.js index 14aa0401..582521c9 100644 --- a/main.js +++ b/main.js @@ -51,3 +51,8 @@ const app = new Vue({ ...App, }); app.$mount(); + +// 全局方法 imgfun +Vue.prototype.imgfun = function(val) { + return val.split("?")[0]; +}; diff --git a/pages.json b/pages.json index 685686d0..5ffbe254 100644 --- a/pages.json +++ b/pages.json @@ -20,7 +20,8 @@ "navigationBarTitleText": "商城", "navigationStyle": "custom", // 隐藏系统导航栏 "navigationBarTextStyle": "black", - "enablePullDownRefresh": true + "enablePullDownRefresh": true, + "onReachBottomDistance": 50 } }, @@ -551,7 +552,54 @@ { "root": "pages/mine", "pages": [ - + { + "path": "mydistribution/index", + "style": { + "navigationBarTitleText": "我的分销" + } + }, + { + "path": "makeMoney/index", + "style": { + "navigationBarTitleText": "赚钱" + } + }, + { + "path": "invite", + "style": { + "navigationBarTitleText": "我的推荐" + } + }, + { + "path": "inviteinput", + "style": { + "navigationBarTitleText": "输入邀请码" + } + }, + { + "path": "expert/index", + "style": { + "navigationBarTitleText": "达人申请" + } + }, + { + "path": "openShop/index", + "style": { + "navigationBarTitleText": "店铺申请" + } + }, + { + "path": "openShop/secon", + "style": { + "navigationBarTitleText": "店铺申请" + } + }, + { + "path": "openShop/ThirdApply", + "style": { + "navigationBarTitleText": "店铺申请" + } + }, { "path": "signIn", "style": { @@ -851,6 +899,24 @@ } } }, + { + "path": "vengoods", + "style": { + "backgroundColor": "#fff", + "navigationStyle": "custom", + "app-plus": { + // 将回弹属性关掉 + "bounce": "none", + // 禁止页面滚动 + "scrollIndicator": "none", + "safearea": { + "bottom": { + "offset": "none" + } + } + } + } + }, { "path": "askList", "style": { diff --git a/pages/cart/payment/payOrder.vue b/pages/cart/payment/payOrder.vue index 0f8da5e5..0db9b128 100644 --- a/pages/cart/payment/payOrder.vue +++ b/pages/cart/payment/payOrder.vue @@ -149,7 +149,6 @@ parms.sn = this.sn; parms.orderType = this.orderType; parms.clientType = this.paymentType; - API_Trade.getCashierData(parms).then((res) => { if(res.data.success){ diff --git a/pages/mine/expert/index.vue b/pages/mine/expert/index.vue new file mode 100644 index 00000000..534aa29a --- /dev/null +++ b/pages/mine/expert/index.vue @@ -0,0 +1,333 @@ + + + + + diff --git a/pages/mine/invite.vue b/pages/mine/invite.vue new file mode 100644 index 00000000..b0c86d24 --- /dev/null +++ b/pages/mine/invite.vue @@ -0,0 +1,149 @@ + + + + diff --git a/pages/mine/inviteinput.vue b/pages/mine/inviteinput.vue new file mode 100644 index 00000000..299e4c09 --- /dev/null +++ b/pages/mine/inviteinput.vue @@ -0,0 +1,91 @@ + + + + diff --git a/pages/mine/makeMoney/index.sass b/pages/mine/makeMoney/index.sass new file mode 100644 index 00000000..e69de29b diff --git a/pages/mine/makeMoney/index.vue b/pages/mine/makeMoney/index.vue new file mode 100644 index 00000000..bb2ec8d1 --- /dev/null +++ b/pages/mine/makeMoney/index.vue @@ -0,0 +1,30 @@ + + + + + + \ No newline at end of file diff --git a/pages/mine/myTracks.vue b/pages/mine/myTracks.vue index a0fa2cd6..fb72ac17 100644 --- a/pages/mine/myTracks.vue +++ b/pages/mine/myTracks.vue @@ -16,7 +16,7 @@ @change="changeChecked(item)"> - + diff --git a/pages/mine/mydistribution/index.vue b/pages/mine/mydistribution/index.vue new file mode 100644 index 00000000..a61e0bfb --- /dev/null +++ b/pages/mine/mydistribution/index.vue @@ -0,0 +1,269 @@ + + + + + diff --git a/pages/mine/openShop/ThirdApply.vue b/pages/mine/openShop/ThirdApply.vue new file mode 100644 index 00000000..25e8af60 --- /dev/null +++ b/pages/mine/openShop/ThirdApply.vue @@ -0,0 +1,323 @@ + + + diff --git a/pages/mine/openShop/index.vue b/pages/mine/openShop/index.vue new file mode 100644 index 00000000..6b4d7bf8 --- /dev/null +++ b/pages/mine/openShop/index.vue @@ -0,0 +1,431 @@ + + + + + diff --git a/pages/mine/openShop/secon.vue b/pages/mine/openShop/secon.vue new file mode 100644 index 00000000..843726e0 --- /dev/null +++ b/pages/mine/openShop/secon.vue @@ -0,0 +1,189 @@ + + + diff --git a/pages/mine/set/feedBack.vue b/pages/mine/set/feedBack.vue index a12ad6df..09be5531 100644 --- a/pages/mine/set/feedBack.vue +++ b/pages/mine/set/feedBack.vue @@ -2,36 +2,68 @@