diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..0d4d636
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,76 @@
+{
+ "editor.tokenColorCustomizations": {
+ "keywords": {
+ "foreground": "#FF0000",
+ "fontStyle": "italic bold"
+ },
+ "variables": {
+ "foreground": "#ffffff",
+ "fontStyle": "italic bold",
+ },
+ //字符串
+ "strings": {
+ "foreground": "#fbff00",
+ "fontStyle": "italic"
+ },
+ //函数
+ "functions": "#00ffff",
+ //注释
+ "comments": "#969696",
+ "types": "#00ff95"
+ },
+ "editor.formatOnSave": true,
+ "editor.wordWrap": "on",
+ // 开启原生括号着色
+ "editor.bracketPairColorization.enabled": true,
+ // 开启代码块边缘导轨线着色
+ "editor.guides.bracketPairs": "active",
+ //覆盖当前所选颜色主题的颜色
+ "workbench.colorCustomizations": {
+ //光标颜色
+ "editorCursor.foreground": "#00ff00",
+ //编辑器背景色
+ "editor.background": "#00000025",
+ //光标所在行边框颜色
+ //光标所在行背景颜色
+ "editor.lineHighlightBorder": "#ffffffa1",
+ "editor.lineHighlightBackground": "#ffffff1e",
+ //光标选中文本的背景颜色
+ //光标选中文本时匹配同类型的值的背景颜色
+ "editor.selectionBackground": "#ff0000c2",
+ "editor.selectionHighlightBackground": "#00ffff80",
+ //缩进参考线的颜色
+ "editorIndentGuide.activeBackground": "#f92672",
+ //方括号出现意外的前景色
+ "editorBracketHighlight.unexpectedBracket.foreground": "#ff0000",
+ //括号的前景色,需要启用括号对着色
+ "editorBracketHighlight.foreground1": "#ffff00",
+ "editorBracketPairGuide.activeBackground1": "#ffff00",
+ "editorBracketHighlight.foreground2": "#f92672",
+ "editorBracketPairGuide.activeBackground2": "#f92672",
+ "editorBracketHighlight.foreground3": "#00ffff",
+ "editorBracketPairGuide.activeBackground3": "#00ffff",
+ "editorBracketHighlight.foreground4": "#00ff00",
+ "editorBracketPairGuide.activeBackground4": "#00ff00",
+ "workbench.colorTheme": "Sublime VSCode Theme",
+ "[Sublime VSCode Theme]": {
+ "activityBar.activeBackground": "#ffffff1e",
+ "activityBar.background": "#292b27",
+ "activityBar.foreground": "#ffffff",
+ "activityBar.activeBorder": "#ff0000",
+ "activityBar.activeFocusBorder": "#ff0000",
+ "breadcrumb.foreground": "#ffffff",
+ "breadcrumb.background": "#1a1b18",
+ "sideBar.background": "#1e1f1c",
+ "sideBarSectionHeader.background": "#343532",
+ "sideBarSectionHeader.foreground": "#fff",
+ "sideBar.border": "#777777",
+ "sideBar.foreground": "#fff",
+ "list.hoverBackground": "#8a8a8a",
+ "list.inactiveSelectionBackground": "#75715e",
+ "editor.selectionBackground": "#ff0000",
+ "editorGroupHeader.tabsBackground": "#141415"
+ },
+ },
+ "editor.cursorBlinking": "smooth",
+}
\ No newline at end of file
diff --git a/app.js b/app.js
index bedd248..5b2eab3 100644
--- a/app.js
+++ b/app.js
@@ -20,3 +20,7 @@ App({
},
statusBarHeight: 0,
})
+
+// 测试账号信息
+// 18872592633
+// 123456GD
diff --git a/assets/images/logo2.png b/assets/images/logo2.png
new file mode 100644
index 0000000..553e91b
Binary files /dev/null and b/assets/images/logo2.png differ
diff --git a/ext.json b/ext.json
index 5754b83..03e8654 100644
--- a/ext.json
+++ b/ext.json
@@ -1,38 +1,38 @@
{
"ext": {
"attr": {
- "configUrl": "https://b.malls.iformall.com",
+ "configUrl": "https://btest.malls.iformall.com",
"datatowerurl": "https://mobile.malls.iformall.com"
},
- "name": "富茂券商户端模板",
- "weappId": "tt7af40c49e5cd8d5001",
+ "name": "福喵商户端",
+ "weappId": "tt60d3166effed27cc01",
"appVersion": "Btest.5.1.0"
},
"debug": false,
"tabBar": {
- "color": "#9F9F9F",
- "selectedColor": "#52a0fd",
- "backgroundColor": "#fff",
"list": [
{
- "pagePath": "pages/main/main",
"text": "首页",
"iconPath": "assets/images/home-n.png",
+ "pagePath": "pages/main/main",
"selectedIconPath": "assets/images/home-y.png"
},
{
- "pagePath": "pages/user/user",
"text": "我的",
"iconPath": "assets/images/user-n.png",
+ "pagePath": "pages/user/user",
"selectedIconPath": "assets/images/user-y.png"
}
- ]
+ ],
+ "color": "#9F9F9F",
+ "selectedColor": "#52a0fd",
+ "backgroundColor": "#fff"
},
"window": {
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#52A0FD"
},
- "extAppid": "tt7af40c49e5cd8d5001",
+ "extAppid": "tt60d3166effed27cc01",
"extEnable": true,
"permission": {
"scope.userLocation": {
diff --git a/pages/index/index.js b/pages/index/index.js
index 2aba32d..22e9b1f 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -9,18 +9,20 @@ Page({
logo: '../../assets/images/logo.png',
phone: '',
pwd: '',
- status:'',
+ status: '',
showpass: "hidepass",
- focus:false,
- password: true
+ focus: false,
+ password: true,
+ ifShowShop: false,
+ merchantList: []
},
onLoad() {
- Common.getMallIcon()
+ Common.getMallIcon()
.then(data => {
// debugge
- console.log(data,777)
+ console.log(data, 777)
this.setData({
- logo: data.data&&data.data.mallImgUrl ? data.data.mallImgUrl : '../../assets/images/logo.png',
+ logo: data.data && data.data.mallImgUrl ? data.data.mallImgUrl : '../../assets/images/logo.png',
})
})
},
@@ -39,34 +41,43 @@ Page({
pwd: pwd
});
}
+
+ // 进入页面后清空bUserId
+ HttpBasics.setBUserId('');
+ tt.setStorageSync("bUserId", '');
+ app.globalData.bUserId = '';
+ tt.setStorage({
+ key: 'bUserId',
+ data: '',
+ })
},
//显示具体的密码
- showpassword:function(){
+ showpassword: function () {
console.log(this.data.password);
let that = this;
- if (that.data.password){
+ if (that.data.password) {
that.setData({
password: false,
- focus:true
+ focus: true
})
- }else{
+ } else {
that.setData({
password: true,
focus: true
})
}
},
- ttLogin(flag){
+ ttLogin(flag) {
let that = this;
tt.login({
success: res => {
Common.getSuperOpenId(res.code)
.then(res => {
console.log(res)
- if (res.data&& res.data.data&&res.data.data.openId){
+ if (res.data && res.data.data && res.data.data.openId) {
app.globalData.superopenId = res.data.data.openId;
}
- if (res.data && res.data.data && res.data.data.session_key){
+ if (res.data && res.data.data && res.data.data.session_key) {
app.globalData.session_key = res.data.data.session_key;
}
if (res.data.code == 200) {
@@ -75,14 +86,14 @@ Page({
ifAlBoss: true,
status: "use"
})
- if (flag =='fromgetPhoneNumber'){
+ if (flag == 'fromgetPhoneNumber') {
tt.navigateTo({
url: `/pages/datatower/datatower?superopenId=${app.globalData.superopenId}&phone=${app.globalData.phone}`,
})
}
-
+
} else {
- if (flag =='fromgetPhoneNumber'){
+ if (flag == 'fromgetPhoneNumber') {
tt.showToast({
title: res.data.message,
icon: "none",
@@ -91,7 +102,7 @@ Page({
}
}
}).catch(error => {
- console.log(error,"error");
+ console.log(error, "error");
that.setData({
error: error.message
})
@@ -117,48 +128,60 @@ Page({
if (pwd != '') {
Common.userLogin(phone, pwd, app.globalData.latitude, app.globalData.longitude)
.then(res => {
- console.log(res);
- if (res.code == 200) {
- HttpBasics.setBUserId(res.data.bUserId);
- tt.setStorageSync("phone", phone);
- tt.setStorageSync("pwd", pwd);
- tt.setStorageSync("bUserId", res.data.bUserId);
- app.globalData.bUserId = res.data.bUserId;
- tt.setStorage({
- key: 'bUserId',
- data: res.data.bUserId,
- })
- tt.login({
- success:function(res){
- Common.getOpenId(res.code,app.globalData.bUserId)
- .then(res => {
- console.log(res,888)
- app.globalData.openId = res.data.data.openId;
- app.globalData.token = res.data.data.token;
- HttpBasics.setToken(res.data.data.token);
- tt.setStorageSync("openId", res.data.data.openId);
- tt.setStorageSync("session_key", res.data.data.session_key);
- tt.showToast({
- image: './../../assets/images/success.png',
- title: '登录成功',
- })
- tt.switchTab({
- url: '/pages/main/main',
- success(res) {
- console.log(`${res}`);
- },
- fail(err) {
- console.log(err,`switchTab调用失败`);
- },
+ const logined = res.data.logined
+ const merchantList = res.data.merchantList
+ // 当logined为true时,正常进入商户
+ if (logined) {
+ if (res.code == 200) {
+ HttpBasics.setBUserId(res.data.bUserId);
+ tt.setStorageSync("phone", phone);
+ tt.setStorageSync("pwd", pwd);
+ tt.setStorageSync("bUserId", res.data.bUserId);
+ app.globalData.bUserId = res.data.bUserId;
+ tt.setStorage({
+ key: 'bUserId',
+ data: res.data.bUserId,
+ })
+ tt.login({
+ success: function (res) {
+ Common.getOpenId(res.code, app.globalData.bUserId)
+ .then(res => {
+ console.log(res, 888)
+ app.globalData.openId = res.data.data.openId;
+ app.globalData.token = res.data.data.token;
+ HttpBasics.setToken(res.data.data.token);
+ tt.setStorageSync("openId", res.data.data.openId);
+ tt.setStorageSync("session_key", res.data.data.session_key);
+ tt.showToast({
+ image: './../../assets/images/success.png',
+ title: '登录成功',
+ })
+ tt.switchTab({
+ url: '/pages/main/main',
+ success(res) {
+ console.log(`${res}`);
+ },
+ fail(err) {
+ console.log(err, `switchTab调用失败`);
+ },
+ })
})
- })
- }
- })
+ }
+ })
+ } else {
+ tt.showToast({
+ image: './../../assets/images/fail.png',
+ title: res.message,
+ icon: "none"
+ })
+ }
+ // 当logined为false时,选择商户
} else {
- tt.showToast({
- image:'./../../assets/images/fail.png',
- title: res.message,
- icon: "none"
+ tt.setStorageSync("phone", phone);
+ tt.setStorageSync("pwd", pwd);
+ this.setData({
+ ifShowShop: true,
+ merchantList: merchantList
})
}
})
@@ -169,13 +192,13 @@ Page({
icon: "none",
})
}
- } else if(phone=="") {
+ } else if (phone == "") {
tt.showToast({
image: './../../assets/images/fail.png',
title: '请输入手机号',
icon: "none"
})
- }else{
+ } else {
tt.showToast({
image: './../../assets/images/fail.png',
title: '手机号有误',
@@ -186,10 +209,16 @@ Page({
/**
* 获得超级管理员手机号
*/
- getPhoneNumber: function (e) {
+ getPhoneNumber: function (e) {
this.ttLogin("fromgetPhoneNumber");
- if (app.globalData.superopenId && app.globalData.session_key){
- let { encryptedData, iv } = { encryptedData: e.detail.encryptedData, iv: e.detail.iv };
+ if (app.globalData.superopenId && app.globalData.session_key) {
+ let {
+ encryptedData,
+ iv
+ } = {
+ encryptedData: e.detail.encryptedData,
+ iv: e.detail.iv
+ };
if (encryptedData && iv) {
Common.getUserPhone(encryptedData, iv, app.globalData.superopenId, app.globalData.session_key)
.then(res => {
@@ -200,12 +229,48 @@ Page({
})
}
})
- }
}
+ }
+ },
+ goShop(e) {
+ const id = e.currentTarget.dataset.id
+ HttpBasics.setBUserId(id);
+ tt.setStorageSync("bUserId", id);
+ app.globalData.bUserId = id;
+ tt.setStorage({
+ key: 'bUserId',
+ data: id,
+ })
+ tt.login({
+ success: function (res) {
+ Common.getOpenId(res.code, app.globalData.bUserId)
+ .then(res => {
+ console.log(res, 888)
+ app.globalData.openId = res.data.data.openId;
+ app.globalData.token = res.data.data.token;
+ HttpBasics.setToken(res.data.data.token);
+ tt.setStorageSync("openId", res.data.data.openId);
+ tt.setStorageSync("session_key", res.data.data.session_key);
+ tt.showToast({
+ image: './../../assets/images/success.png',
+ title: '登录成功',
+ })
+ tt.switchTab({
+ url: '/pages/main/main',
+ success(res) {
+ console.log(`${res}`);
+ },
+ fail(err) {
+ console.log(err, `switchTab调用失败`);
+ },
+ })
+ })
+ }
+ })
},
/**
- * 用户点击右上角分享
- */
+ * 用户点击右上角分享
+ */
onShareAppMessage: function (res) {
let _this = this;
return {
diff --git a/pages/index/index.ttml b/pages/index/index.ttml
index 61c8b48..b9af1e8 100644
--- a/pages/index/index.ttml
+++ b/pages/index/index.ttml
@@ -2,14 +2,17 @@