diff --git a/miniprogram/api/base.ts b/miniprogram/api/base.ts index 4c38cbf..1b47071 100644 --- a/miniprogram/api/base.ts +++ b/miniprogram/api/base.ts @@ -7,18 +7,18 @@ const envVersion = accountInfo.miniProgram.envVersion || "trial"; const GDEnvs = { develop: { - web: "https://tlth5.yijiesudai.com/unicom", + web: "https://h5.goudezhao.com", host: "https://api.1024api.com", mdHost: "https://tcomlog.yijiesudai.com", }, trial: { - web: "https://tlth5.yijiesudai.com/unicom", + web: "https://h5.goudezhao.com", host: "https://api.1024api.com", mdHost: "https://tcomlog.yijiesudai.com", }, release: { - web: "https://lth5.blingfintech.com/unicom", - host: "https://lth5.blingfintech.com", + web: "https://h5.goudezhao.com", + host: "https://api.1024api.com", mdHost: "https://comlog.yijiesudai.com", }, }; diff --git a/miniprogram/api/login/index.ts b/miniprogram/api/login/index.ts index 766978b..2c9a665 100644 --- a/miniprogram/api/login/index.ts +++ b/miniprogram/api/login/index.ts @@ -1,56 +1,64 @@ -import { httpRequest } from '../../utils/request' -const baseUrl = require('../base').allBaseUrl.GDEnvs.host +import { httpRequest } from "../../utils/request"; +const baseUrl = require("../base").allBaseUrl.GDEnvs.host; // 获取图形验证码 export const apiGetCaptchaImage = () => { return httpRequest.post<{ data: { - uuid: string - img: string - } - }>(`${baseUrl}/lt-web/xs/xcx/common/captchaImage`, {}) -} + uuid: string; + img: string; + }; + }>(`${baseUrl}/lt-web/xs/xcx/common/captchaImage`, {}); +}; // 获取短信验证码 export const apiSendSms = (data: { - userName: string - imageCode: string - uuid: string + userName: string; + imageCode: string; + uuid: string; }) => { return httpRequest.post<{ - code: string - msg: string - }>(`${baseUrl}/lt-web/xs/xcx/common/sendSms`, data) -} + code: string; + msg: string; + }>(`${baseUrl}/lt-web/xs/xcx/common/sendSms`, data); +}; // 获取微信唯一编码 export const apiGetWxUserCode = (data: { code: string }) => { return httpRequest.post<{ + code: string; + msg: string; data: { - openid: string - } - }>(`${baseUrl}/lt-web/xs/xcx/common/getWxUserCode`, data) -} + buyer: { buyerId: number; flag: number; token: string }; + }; + }>(`${baseUrl}/api-interface/app/user/login`, data); +}; // 登录 -type ManualLoginType = { loginType: number, userName: string, smsCode: string, openId: string } -type LoginTypeData = { loginType: number, openId: string, code: string } -export const apiLogin = (data: T) => { +type ManualLoginType = { + loginType: number; + userName: string; + smsCode: string; + openId: string; +}; +type LoginTypeData = { loginType: number; openId: string; code: string }; +export const apiLogin = ( + data: T +) => { return httpRequest.post<{ - code: string, - msg: string, + code: string; + msg: string; data: { - userId: string - uniqueCode: string - userName: string, - phone: string - authorizeToken: string - } - }>(`${baseUrl}/lt-web/xs/xcx/common/login`, data) -} + userId: string; + uniqueCode: string; + userName: string; + phone: string; + authorizeToken: string; + }; + }>(`${baseUrl}/lt-web/xs/xcx/common/login`, data); +}; // 退出登录 export const apiLogout = () => { - return httpRequest.post(`${baseUrl}/lt-web/xs/xcx/common/logout`, {}) -} - + return httpRequest.post(`${baseUrl}/lt-web/xs/xcx/common/logout`, {}); +}; diff --git a/miniprogram/app.json b/miniprogram/app.json index 86a3427..8ab663e 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -2,7 +2,7 @@ "window": { "backgroundTextStyle": "light", "navigationBarBackgroundColor": "#fff", - "navigationBarTitleText": "优品尚", + "navigationBarTitleText": "购de着", "navigationBarTextStyle": "black" }, "sitemapLocation": "sitemap.json", @@ -12,13 +12,12 @@ "desc": "获取当前的模糊地理位置" } }, - "requiredPrivateInfos": ["getFuzzyLocation"], "pages": [ "pages/home/index", + "pages/login/index", "pages/category/index", "pages/shopping-cart/index", "pages/mine/index", - "pages/login/index", "pages/H5/index", "pages/setup/index", "pages/download/index" diff --git a/miniprogram/assets/images/login/logo.jpg b/miniprogram/assets/images/login/logo.jpg new file mode 100644 index 0000000..3a41f6b Binary files /dev/null and b/miniprogram/assets/images/login/logo.jpg differ diff --git a/miniprogram/assets/images/login/logo.png b/miniprogram/assets/images/login/logo.png deleted file mode 100644 index 59cd1d6..0000000 Binary files a/miniprogram/assets/images/login/logo.png and /dev/null differ diff --git a/miniprogram/pages/category/index.ts b/miniprogram/pages/category/index.ts index c1eea28..de6a40e 100644 --- a/miniprogram/pages/category/index.ts +++ b/miniprogram/pages/category/index.ts @@ -170,7 +170,7 @@ Page({ onGoCommodity(e: WechatMiniprogram.TouchEvent) { wx.navigateTo({ url: `/pages/H5/index?url=${encodeURIComponent( - `https://www.baidu.com?id=${e.currentTarget.dataset.id}` + `https://www.goudezhao.com/commodity-detail?id=${e.currentTarget.dataset.id}` )}`, }); }, diff --git a/miniprogram/pages/home/index.ts b/miniprogram/pages/home/index.ts index 38d1837..94a53ee 100644 --- a/miniprogram/pages/home/index.ts +++ b/miniprogram/pages/home/index.ts @@ -2,6 +2,7 @@ import { apiGetAppCategoryList, apiGetHome } from "../../api/index/index"; import { setGlobalData } from "../../utils/common"; +import { onGoH5Page } from "../../utils/getUserInfo"; Page({ data: { @@ -9,7 +10,7 @@ Page({ searchValue: "", isScrolled: false, categories: [ - { id: 2, name: "水果鲜花", categoryId: 1, icon: "/icons/fruit.png" }, + /* { id: 2, name: "水果鲜花", categoryId: 1, icon: "/icons/fruit.png" }, { id: 3, name: "蔬菜豆制品", @@ -22,7 +23,7 @@ Page({ { id: 7, name: "巧克力", categoryId: 6, icon: "/icons/chocolate.png" }, { id: 8, name: "薯片", icon: "/icons/chips.png" }, { id: 9, name: "饮料", icon: "/icons/drink.png" }, - { id: 10, name: "休闲零食", icon: "/icons/snack.png" }, + { id: 10, name: "休闲零食", icon: "/icons/snack.png" }, */ ], flashSaleProducts: [ { @@ -55,7 +56,7 @@ Page({ }, ], recommendedProducts: [ - { + /* { id: 1, name: "[七夕]吻月粉红雪山玫瑰花束9枝", price: 79, @@ -87,7 +88,7 @@ Page({ image: "/images/pepsi.jpg", tags: ["真低价，放心购"], sales: "800+", - }, + }, */ ], }, // 搜索框输入事件 @@ -125,12 +126,21 @@ Page({ onGoCommodity(e: any) { wx.navigateTo({ url: `/pages/H5/index?url=${encodeURIComponent( - `https://www.baidu.com?id=${e.currentTarget.dataset.id}` + `https://h5.goudezhao.com/commodity-detail?id=${e.currentTarget.dataset.id}` )}`, }); }, + // 添加到购物车 + onAddToCart(e: any) { + onGoH5Page({ + is_need_login: true, + type: "", + url: `/commodity-detail?id=${e.currentTarget.dataset.id}`, + }); + // 这里可以添加购物车逻辑 + }, handleGetHomePage() { - apiGetHome().then((res: any) => { + apiGetHome({}).then((res: any) => { // console.warn("----- my data is res222: ", res); this.setData({ recommendedProducts: res.data.rows.map((item: any) => ({ diff --git a/miniprogram/pages/home/index.wxml b/miniprogram/pages/home/index.wxml index cde37fe..d531deb 100644 --- a/miniprogram/pages/home/index.wxml +++ b/miniprogram/pages/home/index.wxml @@ -62,7 +62,7 @@ ￥{{item.price}} ￥{{item.originalPrice}} - + ¥50.52 合计： diff --git a/miniprogram/utils/getUserInfo.ts b/miniprogram/utils/getUserInfo.ts index b2250e3..5d74bf3 100644 --- a/miniprogram/utils/getUserInfo.ts +++ b/miniprogram/utils/getUserInfo.ts @@ -1,82 +1,96 @@ -import { Base64 } from 'js-base64' +import { Base64 } from "js-base64"; -export const wxInfo = wx.getSystemInfoSync() -export const mpInfo = wx.getAccountInfoSync() -export const miniProgramVersion = mpInfo.miniProgram.version || '1.0.0' +export const wxInfo = wx.getSystemInfoSync(); +export const mpInfo = wx.getAccountInfoSync(); +export const miniProgramVersion = mpInfo.miniProgram.version || "1.0.0"; +const webUrl = require("../api/base").allBaseUrl.GDEnvs.web; // 获取微信小程序token -export const getWxToken = async() => { - return new Promise(resolve => { - wx.showLoading({ title: '加载中' }) +export const getWxToken = async () => { + return new Promise((resolve) => { + wx.showLoading({ title: "加载中" }); wx.getStorage({ - key: 'user_info', + key: "user_info", async success(res) { if (res.data.token) { - wx.hideLoading() - const envParams = { linktoken: 'miniProgram' } + wx.hideLoading(); + const envParams = { linktoken: "miniProgram" }; // 获取经纬度 - const locationDataObj = wx.getStorageSync('locationData') - if (locationDataObj) Object.assign(envParams, { ...locationDataObj }) + const locationDataObj = wx.getStorageSync("locationData"); + if (locationDataObj) Object.assign(envParams, { ...locationDataObj }); // 获取小程序启动时的参数 - const launchOptions = wx.getStorageSync('launch_options') - if (launchOptions) Object.assign(envParams, { wxXcxLaunchOptions: launchOptions }) - + const launchOptions = wx.getStorageSync("launch_options"); + if (launchOptions) + Object.assign(envParams, { wxXcxLaunchOptions: launchOptions }); + // 获取系统信息 Object.assign(envParams, { phoneType: wxInfo.model, - devType: wxInfo.platform === 'ios' ? 0 : 1, + devType: wxInfo.platform === "ios" ? 0 : 1, devOS: wxInfo.platform, devOSVersion: wxInfo.system, devVersion: wxInfo.version, - appVersion: miniProgramVersion.replace(/\./g, '') - }) - + appVersion: miniProgramVersion.replace(/\./g, ""), + }); + const extendParams = { - lzCode: 'CJTG_XCX_LZ', + lzCode: "CJTG_XCX_LZ", uniqueCode: res.data.uniqueCode, userName: res.data.userName, userId: res.data.userId, - token: res.data.token - } + token: res.data.token, + }; wx.getStorage({ - key: 'unique_code', + key: "unique_code", success(res) { if (res) { - Object.assign(extendParams, { uniqueCode: res }) + Object.assign(extendParams, { uniqueCode: res }); } - } - }) - const obj = { envParams, extendParams } - const returnDataValue = encodeURIComponent(Base64.encode(JSON.stringify(obj))) - resolve(returnDataValue) + }, + }); + const obj = { envParams, extendParams }; + const returnDataValue = encodeURIComponent( + Base64.encode(JSON.stringify(obj)) + ); + resolve(returnDataValue); } }, fail() { - wx.hideLoading() - wx.navigateTo({ url: '/pages/login/index' }) - } - }) - }) -} + wx.hideLoading(); + wx.navigateTo({ url: "/pages/login/index" }); + }, + }); + }); +}; // 跳转H5页面 export const onGoH5Page = (params: any) => { // url跳转链接，is_need_login是否需要登录：true是、false否，type页面类型：third三方 - const { type, url, is_need_login } = params + const { type, url, is_need_login } = params; if (is_need_login) { getWxToken().then((res: any) => { if (res) { - const targetUrl = `${url}${/\?/.test(url) ? '&' : '?'}returnData=${res}` - wx.navigateTo({ url: `/pages/H5/index?url=${encodeURIComponent(targetUrl)}` }) + const targetUrl = `${webUrl}${url}${ + /\?/.test(url) ? "&" : "?" + }returnData=${res}`; + wx.navigateTo({ + url: `/pages/H5/index?url=${encodeURIComponent(targetUrl)}`, + }); } - }) + }); } else { - if (type === 'third') { - wx.navigateTo({ url: `/pages/H5/index?url=${encodeURIComponent(url)}` }) + if (type === "third") { + wx.navigateTo({ url: `/pages/H5/index?url=${encodeURIComponent(url)}` }); } else { - const targetUrl = `${url}${/\?/.test(url) ? '&' : '?'}jumpData=${encodeURIComponent(Base64.encode(JSON.stringify({ is_need_login: false })))}` - wx.navigateTo({ url: `/pages/H5/index?url=${encodeURIComponent(targetUrl)}` }) + const targetUrl = `${url}${ + /\?/.test(url) ? "&" : "?" + }jumpData=${encodeURIComponent( + Base64.encode(JSON.stringify({ is_need_login: false })) + )}`; + wx.navigateTo({ + url: `/pages/H5/index?url=${encodeURIComponent(targetUrl)}`, + }); } } -} \ No newline at end of file +}; diff --git a/project.config.json b/project.config.json index c5e0ebc..bf1329b 100644 --- a/project.config.json +++ b/project.config.json @@ -39,7 +39,7 @@ "simulatorPluginLibVersion": {}, "condition": {}, "srcMiniprogramRoot": "miniprogram/", - "appid": "wx63bcaf38e587b406", + "appid": "wx75fa59c097bd3dfd", "libVersion": "2.32.3", "editorSetting": { "tabIndent": "insertSpaces",