From 378fc78c5ba52c40ec187f23ed347a9787243f0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=B1=AA?= <781521347@qq.com> Date: Sat, 27 Nov 2021 18:36:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/http.js | 10 +++++----- api/user.js | 2 +- pages/companyInfo/index.wxml | 5 ++--- pages/companyInfo/index.wxss | 1 + pages/goodsDetail/index.js | 3 ++- pages/goodsDetail/index.wxml | 8 ++++---- pages/goodsDetail/index.wxss | 8 ++++---- pages/home/index.wxss | 8 ++++---- pages/user/cashOut/index.js | 2 +- pages/user/cashOut/index.wxml | 2 +- pages/user/index.js | 14 ++++++++------ pages/user/index.wxml | 2 +- pages/user/myTeam/index.js | 21 +++++++++++++++++---- pages/user/myTeam/index.json | 3 ++- pages/user/myTeam/index.wxml | 16 +++++++++++----- 15 files changed, 64 insertions(+), 41 deletions(-) diff --git a/api/http.js b/api/http.js index 9cd5832..792be50 100644 --- a/api/http.js +++ b/api/http.js @@ -1,9 +1,9 @@ -const baseURL = 'http://192.168.0.112:8088/api/'; - +const baseURL= 'http://192.168.0.111:8088/api/'; +// const baseURL= "https://www.cyjyyjy.com/api/" export function $http(methods,url,params){ var header = { 'content-type': 'application/json', - 'Authorization' :'Bearer '+ wx.getStorageSync('token') || '', + 'Authorization':'Bearer '+ wx.getStorageSync('token') || '', 'dept': '22' }; return new Promise((resolve,reject)=>{ @@ -29,7 +29,7 @@ export function $http(methods,url,params){ } else{ wx.showToast({ title: '服务器错误，请稍后再试！', - icon : 'none' + icon: 'none' }) reject(err) } @@ -38,7 +38,7 @@ export function $http(methods,url,params){ wx.hideLoading(); wx.showToast({ title: '服务器错误，请稍后再试！', - icon : 'none' + icon: 'none' }) reject(err) } diff --git a/api/user.js b/api/user.js index 1e7cbac..8e053cb 100644 --- a/api/user.js +++ b/api/user.js @@ -15,7 +15,7 @@ export function saleLeads(data){ // 获取我的团队 export function getMyTeam(){ - return http.$http('get','getTeam') + return http.$http('post','user/myTeam') } // 积分动态 diff --git a/pages/companyInfo/index.wxml b/pages/companyInfo/index.wxml index 627fb17..907ddb3 100644 --- a/pages/companyInfo/index.wxml +++ b/pages/companyInfo/index.wxml @@ -6,13 +6,12 @@ - 深圳市瑞梦思时代科技有限公司，瑞蓢国际集团旗下全资子公司，以能量家居系统、智慧健康睡眠生态系统为主打的核心品牌。当前旗下产品包括“重塑本元”、“吉祥卧”床垫，“少年强”青少年床垫，旅行垫，魔术减负能量背包等。\n - 瑞梦思以“专注每一天，健康每一夜”为目标，为人们研发贯穿生活各方面的能量家居产品，让每个家庭，每个人都能从源头开始防患于未然，远离亚健康，享受真正健康轻松的幸福生活。 + 深圳市瑞梦思时代科技有限公司，瑞蓢国际集团旗下全资子公司，以能量家居系统、智慧健康睡眠生态系统为主打的核心品牌。当前旗下产品包括“重塑本元”、“吉祥卧”床垫，“少年强”青少年床垫，旅行垫，魔术减负能量背包等。\n瑞梦思以“专注每一天，健康每一夜”为目标，为人们研发贯穿生活各方面的能量家居产品，让每个家庭，每个人都能从源头开始防患于未然，远离亚健康，享受真正健康轻松的幸福生活。 - + diff --git a/pages/companyInfo/index.wxss b/pages/companyInfo/index.wxss index 5f75be8..9358444 100644 --- a/pages/companyInfo/index.wxss +++ b/pages/companyInfo/index.wxss @@ -17,6 +17,7 @@ .title-box{ width: 100%; height: 92rpx; + margin: 32rpx 0; } .title-box image{ width: 100%; diff --git a/pages/goodsDetail/index.js b/pages/goodsDetail/index.js index 80985a9..1ae0a32 100644 --- a/pages/goodsDetail/index.js +++ b/pages/goodsDetail/index.js @@ -33,8 +33,9 @@ Page({ }, getProductDetail(){ store.getProductDetail(this.data.form.id).then((res)=>{ + + res.data.data.storeInfo.description.replace(/\ - {{detail.storeInfo.storeName}} - ￥{{detail.storeInfo.price}} - 原价：￥{{detail.storeInfo.otPrice}} + {{detail.storeInfo.storeName || '瑞梦思'}} + ￥{{detail.storeInfo.price || 0}} + 原价：￥{{detail.storeInfo.otPrice || 0}} - 销量：{{detail.storeInfo.sales}} + 销量：{{detail.storeInfo.sales || 0}}