diff --git a/src/js/api.js b/src/js/api.js
new file mode 100644
index 0000000..90847cc
--- /dev/null
+++ b/src/js/api.js
@@ -0,0 +1,12 @@
+export const ORIGIN = ``; // 正式
+
+
+export const API = {
+ wechatMiniAppLoginAndSync:`${ORIGIN}/user/wechatMiniAppLoginAndSync`, // 小程序授权
+}
+
+
+export default { ORIGIN, API };
+
+
+
diff --git a/src/js/server.js b/src/js/server.js
new file mode 100644
index 0000000..e915940
--- /dev/null
+++ b/src/js/server.js
@@ -0,0 +1,93 @@
+import util from '../utils/util';
+// import { app as vm } from '../main';
+const islog = false
+
+export class Server {
+ request(url,data,method,header,isDefaultGet,failMsg){
+ return new Promise(async (rs,rj)=>{
+ const _store = vm.$store;
+
+ let storeInfo = _store.state.storeInfo || null;
+
+ if(storeInfo)data['brand_id'] = storeInfo.brand_id;
+
+ const _token = uni.getStorageSync('token') || '';
+ if(_token)data['token'] = _token;
+
+ uni.request({
+ url,
+ data,
+ method, // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT
+ header: {...header}, // 设置请求的 header // {'custom-header': 'application/json'}
+ success: res=>{
+ if(islog)console.log('req success---->',{
+ link: url,
+ query: data,
+ method: method,
+ data: res,
+ })
+ if(isDefaultGet){
+ if(failMsg == '')throw Error('默认回调，失败提示不能为空 key -> failMsg');
+ defaultGet({
+ url,
+ data,
+ res,
+ failMsg,
+ resolve: rs,
+ reject: rj
+ });
+ return
+ }
+ rs(res);
+ },
+ fail: err=>{
+ if(islog)console.log('req fail---->',{
+ link: url,
+ query: data,
+ method: method,
+ data: err,
+ })
+ util.hideLoad();
+ if(typeof(err.errMsg) == 'string'&&(err.errMsg.indexOf('timeout')!=-1 || err.errMsg.indexOf('interrupted')!=-1 || err.errMsg.indexOf('请求超时')!=-1)){
+ util.showNone('网络超时！');
+ }else if(typeof(err.errMsg) == 'string'){
+ util.showNone(err.errMsg);
+ }else{
+ util.showNone('请求数据失败！请检查当前网络状态。');
+ }
+ rj(err);
+ },
+ })
+ })
+
+ function defaultGet({res,failMsg,resolve,reject,url,data}){
+ if(res.data.code == 0){
+ resolve(res.data.data);
+ }else{
+ util.hideLoad();
+ util.showNone(res.data.message || failMsg || '');
+ reject({url,res,data});
+ }
+ }
+ }
+ get({url,data={},header={},isDefaultGet=true,failMsg=''}){
+ return this.request(url,data,'GET',header,isDefaultGet,failMsg);
+ }
+
+ post({url,data={},header={'custom-header': 'application/json'},isDefaultGet=true,failMsg=''}){
+ return this.request(url,data,'POST',header,isDefaultGet,failMsg);
+ }
+
+ uploadFile({url,filePath,onProgressCallBack,formData={}}){
+ return new Promise((rs,rj)=>{
+ let uploadTask = wx.uploadFile({
+ url,filePath,formData,name:'file',success:rs,fail:rj
+ })
+ uploadTask.onProgressUpdate(res=>onProgressCallBack&&onProgressCallBack(res))
+ })
+ }
+}
+
+export const servers = new Server();
+
+export default {servers,Server};
\ No newline at end of file
diff --git a/src/manifest.json b/src/manifest.json
index 972bd1e..25d192e 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -54,7 +54,7 @@
},
"mp-weixin": { /* 微信小程序特有相关 */
- "appid": "",
+ "appid": "wxf1294b279ad1b845",
"setting": {
"urlCheck": false
},
diff --git a/src/pages.json b/src/pages.json
index 14964b4..1e2e4d2 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1,6 +1,11 @@
{
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{
+ "path": "pages/index/index",
+ "style": {
+ }
+ },
+ {
"path": "pages/turnover/turnover",
"style": {
"navigationBarTitleText": "营业额"
@@ -96,11 +101,7 @@
"navigationBarTitleText": "商家登录"
}
},
- {
- "path": "pages/index/index",
- "style": {
- }
- },
+
{
"path": "pages/merchant_info/merchant_info",
"style": {
diff --git a/src/pages/employee/manage/manage.vue b/src/pages/employee/manage/manage.vue
index 25e5a1f..f29b9d9 100644
--- a/src/pages/employee/manage/manage.vue
+++ b/src/pages/employee/manage/manage.vue
@@ -8,7 +8,7 @@
-
+
添加员工
@@ -25,7 +25,7 @@
胡雪儿
超级管理员
- 更换
+ 更换
@@ -35,13 +35,13 @@
员工总数 3
- 筛选
+ 筛选
删除
取消
-
+
@@ -70,8 +70,22 @@