diff --git a/app.json b/app.json index 584d3dc..75a3d4e 100644 --- a/app.json +++ b/app.json @@ -1,10 +1,8 @@ { "pages": [ "pages/login/login", - "pages/navigation/navigation", - "pages/selectCustomer/selctCustomer", - "pages/index/index", - "pages/main/main", + "pages/homePage/homePage", + "pages/message/message", "pages/my/my", "pages/saleForecastList/saleForecastList", "pages/saleForecastList/Detail/Detail", @@ -19,25 +17,30 @@ "pages/guarantee/newbill/newbill", "pages/guarantee/selectbill/selectbill", "pages/guarantee/detailshow/detailshow" - ], "window": { "backgroundTextStyle": "light", - "navigationBarBackgroundColor": "#2589f8", - "navigationBarTitleText": "业务易", - "navigationBarTextStyle": "#FFFFFF", - "disableScroll": true + "navigationBarTitleText": "畜业务员易", + "navigationBarBackgroundColor": "#2689f8", + "navigationBarTextStyle": "#FFFFFF" }, "tabBar": { - "selectedColor": "#00C7B3", - "color": "#CFCFCF", + "borderStyle": "white", + "selectedColor": "#2689f8", + "color": "#999999", "list": [ { - "pagePath": "pages/main/main", + "pagePath": "pages/homePage/homePage", "text": "主页", "iconPath": "/imgs/main1.png", "selectedIconPath": "/imgs/main.png" }, + { + "pagePath": "pages/message/message", + "text": "消息", + "iconPath": "/imgs/message.png", + "selectedIconPath": "/imgs/messageSelected.png" + }, { "pagePath": "pages/my/my", "text": "我的", diff --git a/imgs/avatarUrl.png b/imgs/avatarUrl.png new file mode 100644 index 0000000..54fce44 Binary files /dev/null and b/imgs/avatarUrl.png differ diff --git a/imgs/backGroundImage.png b/imgs/backGroundImage.png new file mode 100644 index 0000000..334feb8 Binary files /dev/null and b/imgs/backGroundImage.png differ diff --git a/imgs/cheaperApply.png b/imgs/cheaperApply.png new file mode 100755 index 0000000..81986cc Binary files /dev/null and b/imgs/cheaperApply.png differ diff --git a/imgs/jiantou.png b/imgs/jiantou.png new file mode 100644 index 0000000..6fbbc30 Binary files /dev/null and b/imgs/jiantou.png differ diff --git a/imgs/main-bg.jpg b/imgs/main-bg.jpg deleted file mode 100644 index acc5782..0000000 Binary files a/imgs/main-bg.jpg and /dev/null differ diff --git a/imgs/message.png b/imgs/message.png new file mode 100755 index 0000000..0aaf452 Binary files /dev/null and b/imgs/message.png differ diff --git a/imgs/messageSelected.png b/imgs/messageSelected.png new file mode 100755 index 0000000..a14a7ef Binary files /dev/null and b/imgs/messageSelected.png differ diff --git a/imgs/saleOutStore.png b/imgs/saleOutStore.png new file mode 100755 index 0000000..1955470 Binary files /dev/null and b/imgs/saleOutStore.png differ diff --git a/imgs/selected.png b/imgs/selected.png new file mode 100755 index 0000000..51db0d9 Binary files /dev/null and b/imgs/selected.png differ diff --git a/imgs/unChoice.png b/imgs/unChoice.png new file mode 100755 index 0000000..b5f8e8c Binary files /dev/null and b/imgs/unChoice.png differ diff --git a/imgs/zhuye.png b/imgs/zhuye.png deleted file mode 100644 index 6d9fbce..0000000 Binary files a/imgs/zhuye.png and /dev/null differ diff --git a/imgs/zhuye1.png b/imgs/zhuye1.png deleted file mode 100644 index 816a877..0000000 Binary files a/imgs/zhuye1.png and /dev/null differ diff --git a/pages/homePage/homePage.js b/pages/homePage/homePage.js new file mode 100644 index 0000000..7723332 --- /dev/null +++ b/pages/homePage/homePage.js @@ -0,0 +1,100 @@ +// pages/homePage/homePage.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 点击页面按钮进行跳转 + */ + transBtnClicked: function (event) { + var btnID = event.currentTarget.dataset.itemid; + var transferURL = ''; + switch (btnID) { + // 销售预报 + case "1": + transferURL = '/pages/saleForecastList/saleForecastList'; + break; + // 销售订单 + case "2": + transferURL = '/pages/order/order'; + break; + // 特价申请 + case "3": + transferURL = '/pages/orderList/orderList'; + break; + // 销售出库 + case "4": + transferURL = '/pages/myCars/myCars'; + break; + // 担保单 + case "5": + transferURL = '/pages/guarantee/guarantee'; + break; + } + + wx.navigateTo({ + url: transferURL, + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/homePage/homePage.json b/pages/homePage/homePage.json new file mode 100644 index 0000000..a703c2d --- /dev/null +++ b/pages/homePage/homePage.json @@ -0,0 +1,3 @@ +{ + "navigationBarTitleText": "我的业务" +} \ No newline at end of file diff --git a/pages/homePage/homePage.wxml b/pages/homePage/homePage.wxml new file mode 100644 index 0000000..b26a018 --- /dev/null +++ b/pages/homePage/homePage.wxml @@ -0,0 +1,27 @@ + + + + + + + + + 销售预报 + + + + 销售订单 + + + + 特价申请 + + + + 销售出库 + + + + 担保单 + + \ No newline at end of file diff --git a/pages/homePage/homePage.wxss b/pages/homePage/homePage.wxss new file mode 100644 index 0000000..693b4e5 --- /dev/null +++ b/pages/homePage/homePage.wxss @@ -0,0 +1,50 @@ +/* pages/homePage/homePage.wxss */ + +page{ + background:#EAF1F8; +} + +.imageContainer{ + width: 100%; + height: 280rpx; + background-color: #2E8CF5; +} + +.beijingtu{ +width: 100%; +height: 100%; +} + +.body-box{ +width: 100%; +display: flex; +flex-wrap: wrap; +background: white; +background: #FEFFFF; +overflow: hidden; +margin-top: 1rpx; +} + +.ico{ +height: 190rpx; +width:25%; +text-align: center; +display: flex; +flex-direction: column; +padding-top: 15rpx; +} + +.ico image{ +display: block; +width: 50%; +height: 50%; +margin-left: 25%; +margin-top: 15rpx; + +} + +.text{ +color: #353535; +margin-top: 10rpx; +font-size: 28rpx; +} diff --git a/pages/index/index.js b/pages/index/index.js deleted file mode 100644 index 99f5224..0000000 --- a/pages/index/index.js +++ /dev/null @@ -1,164 +0,0 @@ -//index.js -const app = getApp(); - -var network = require("../../utils/net.js"); - -var isBindedPath = '/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/AccountRpc/IsBinded'; -var isBindByPhone = '/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/AccountRpc/XuBindByPhone'; - -var isBindWeixinPath = '/MainSystem/B3WeChatMiniProgram/Rpcs/CommonRpc/IsBindWeixinMP'; -var getOpenIdByCode = '/MainSystem/B3WeChatMiniProgram/Rpcs/CommonRpc/GetMiniOpenIdByCode'; -var bindPath = "/MainSystem/B3WeChatMiniProgram/Rpcs/CommonRpc/Bind"; -var getBindCustomer = '/MainSystem/B3WeChatMiniProgram/Rpcs/CommonRpc/GetBindCustomer'; - -function WeixinLogin() { - let method = app.globalData.LoginPath; - let params = [app.globalData.AppId, app.globalData.OpenId]; - - network.transfer_request(method, params, function(res) { - app.globalData.DecryptCookie = res.result; - }) -} - -function IsBindWeixinMP(phone) { - - let method = isBindWeixinPath - let params = [phone]; - network.requestLoading(method, params, function(res) { - res.result = true; - if (res.result == true) { - - WeixinLogin() - - wx.switchTab({ - url: '/pages/main/main', - }) - } else { - wx.showModal({ - title: '提示', - content: '请关注公众号', - showCancel: false, - }) - } - }) -} - -function Bind(page) { - let userInfos = app.globalData.UserInfo - let method = bindPath; - let params = [{ - "AppId": app.globalData.AppId, - "OpenId": app.globalData.OpenId, - "Phone": page.data.phoneNum, - "NickName": userInfos.nickName, - "Sex": userInfos.gender, - "Province": userInfos.province, - "City": userInfos.city, - "Country": userInfos.country, - "HeadImgUrl": userInfos.avatarUrl, - "UnionId": "", - "CustomerId": app.globalData.CustomerId - }]; - network.requestLoading(method, params, function (res) { - if (res.result == true) { - IsBindWeixinMP(app.globalData.PhoneNum) - } - }) - -} - -Page({ - data: { - userInfo: "", //用户信息 - phoneNum: "" - }, - - getPhoneNum: function(e) { - let val = e.detail.value; - this.data.phoneNum = val; - }, - - onLoad: function(options) { - - }, - - onShow: function() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function() { - var that = this; - var shareObj = { - title: "", // 默认是小程序的名称(可以写slogan等) - path: '/pages/index/index', // 默认是当前页面，必须是以‘/’开头的完整路径 - imgUrl: '', //自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4 - success: function(res) {　　　 - if (res.errMsg == 'shareAppMessage:ok') { - - } - }, - fail: function() { // 转发失败之后的回调 　　　　　　 - if (res.errMsg == 'shareAppMessage:fail cancel') { // 用户取消转发 - wx.showToast({ - title: '取消转发', - }) - } else if (res.errMsg == 'shareAppMessage:fail') { // 转发失败，其中 detail message 为详细失败信息 - wx.showToast({ - title: '转发失败，重新分享', - }) - } - }, - complete: function() { - - } - }; - return shareObj; - }, - - getUserInfo: function(e) { - var that = this; - if (e.detail.userInfo != null) { - app.globalData.UserInfo = e.detail.userInfo - - if (this.data.phoneNum == "") { - wx.showToast({ - title: '请输入手机号码', - }) - return false; - } else if (!(/^1[34578]\d{9}$/.test(this.data.phoneNum))) { - wx.showToast({ - title: '号码不正确', - }) - return false; - } - let userInfos = app.globalData.UserInfo - - let method = isBindByPhone; - let params = [{ - "OpenId": app.globalData.OpenId, - "Phone": this.data.phoneNum, - "NickName": userInfos.nickName, - "Sex": userInfos.gender, - "Province": userInfos.province, - "City": userInfos.city, - "Country": userInfos.country, - "HeadImgUrl": userInfos.avatarUrl, - "UnionId": "" - }]; - - network.transfer_request(method, params, function(res) { - app.globalData.PhoneNum = that.data.PhoneNum; - Bind(that) - }) - } else { - wx.showModal({ - title: '授权提示', - content: '请给予权限，不涉及个人隐私', - showCancel: false - }) - } - } -}) \ No newline at end of file diff --git a/pages/index/index.wxml b/pages/index/index.wxml deleted file mode 100644 index d2a3e93..0000000 --- a/pages/index/index.wxml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/pages/index/index.wxss b/pages/index/index.wxss deleted file mode 100644 index ddb1f82..0000000 --- a/pages/index/index.wxss +++ /dev/null @@ -1,54 +0,0 @@ -/**index.wxss**/ - -page { - background: #fff; -} - -.img1 { - margin-left: 35%; - height: 150px; - width: 150px; - margin-top: 20%; -} - -.view1 { - color: #fff; - font-size: 25px; - margin-top: -10%; - margin-left: 30%; - margin-bottom: 10%; -} - -.view2 { - border-top: 1px solid #fafafa; - border-right: 1px solid #fafafa; - border-left: 1px solid #fafafa; - border-bottom: 1px solid #fafafa; - width: 90%; - height: 40px; - margin-left: 5%; - margin-right: 5%; - border-radius: 0.2em; - margin-top: 10%; -} - -.input { - text-align: center; - height: 40px; - background: #fafafa; -} - -.denglu { - margin-left: 5%; - margin-top: 10%; - width: 90%; - margin-right: 5%; - color: #fff; - background: linear-gradient(to right, #39c4fd, #539eef); -} - -.wxmp { - position: fixed; - bottom: 0rpx; - width: 100%; -} diff --git a/pages/login/login.js b/pages/login/login.js index f08bc99..8d850c5 100644 --- a/pages/login/login.js +++ b/pages/login/login.js @@ -4,6 +4,14 @@ var network = require("../../utils/net.js"); var app = getApp(); var openID; +var isBindedPath = '/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/AccountRpc/IsBinded'; +var isBindByPhone = '/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/AccountRpc/XuBindByPhone'; + +var isBindWeixinPath = '/MainSystem/B3WeChatMiniProgram/Rpcs/CommonRpc/IsBindWeixinMP'; +var getOpenIdByCode = '/MainSystem/B3WeChatMiniProgram/Rpcs/CommonRpc/GetMiniOpenIdByCode'; +var bindPath = "/MainSystem/B3WeChatMiniProgram/Rpcs/CommonRpc/Bind"; +var getBindCustomer = '/MainSystem/B3WeChatMiniProgram/Rpcs/CommonRpc/GetBindCustomer'; + /** * 获取绑定客户ID及用户电话 参数1、appID 2、openID * 返回值globalCustomerID，WeixinUser_Phone @@ -39,7 +47,7 @@ function IsBinded(openid) { } // 判断是否关注公众号 参数phone 返回值bool 成功进入首页 function IsBindWeixinMP(phone) { - let method = '/MainSystem/B3WeChatMiniProgram/Rpcs/CommonRpc/IsBindWeixinMP'; + let method = isBindWeixinPath; let params = [phone]; network.requestLoading(method, params, function (res) { // res.result = false; @@ -109,9 +117,10 @@ Page({ // 页面生命周期函数 onShow: function () { + var that = this; + /* //由登录页面进入详情页变更值为0；分享直接进入为1 app.globalData.shareInState = 0; - var that = this; wx.login({ success: function (res) { let code = res.code; @@ -123,6 +132,7 @@ Page({ }) } }); + */ let method = '/MainSystem/B3WeChatMiniProgram/Rpcs/CustomerRpc/GetList'; let params = []; network.requestLoading(method, params, function (res) { @@ -144,6 +154,10 @@ Page({ // 获取授权 成功 绑定信息到客户服务器 回调函数绑定中转服务器 getUserInfo: function (e) { + wx.switchTab({ + url: '/pages/homePage/homePage', + }) + /* var that = this; if (e.detail.userInfo != null) { app.globalData.userInfo = e.detail.userInfo @@ -190,7 +204,9 @@ Page({ showCancel: false }) } - } + */ + }, + }) diff --git a/pages/login/login.wxml b/pages/login/login.wxml index e6c1e2d..fc6bd28 100644 --- a/pages/login/login.wxml +++ b/pages/login/login.wxml @@ -21,7 +21,7 @@ - + 确认绑定 diff --git a/pages/main/main.js b/pages/main/main.js deleted file mode 100644 index a3b428f..0000000 --- a/pages/main/main.js +++ /dev/null @@ -1,94 +0,0 @@ -// pages/main/main.js -// pages/indexL/indexL.js -var network = require("../../utils/net.js") -var app = getApp() - -function WeixinLogin() { - let method = app.globalData.LoginPath; - let params = [app.globalData.AppId, app.globalData.OpenId]; - - network.transfer_request(method, params, function(res) { - app.globalData.Cookie = res.result; - }) -} - -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function(options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function() { - - }, - saleForecast: function(e) { - wx.navigateTo({ - url: '/pages/saleForecastList/saleForecastList', - }) - }, - order: function(e) { - wx.navigateTo({ - url: '/pages/order/order', - }) - }, - guarantee: function(e) { - wx.navigateTo({ - url: '/pages/guarantee/guarantee', - }) - } -}) \ No newline at end of file diff --git a/pages/main/main.json b/pages/main/main.json deleted file mode 100644 index acc0770..0000000 --- a/pages/main/main.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "navigationBarTitleText": "首页" -} \ No newline at end of file diff --git a/pages/main/main.wxml b/pages/main/main.wxml deleted file mode 100644 index 3e0dc18..0000000 --- a/pages/main/main.wxml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - 销售预报 - - - - - 销售订单 - - - - - 业务担保 - - diff --git a/pages/main/main.wxss b/pages/main/main.wxss deleted file mode 100644 index ee35668..0000000 --- a/pages/main/main.wxss +++ /dev/null @@ -1,33 +0,0 @@ -/* pages/main/main.wxss */ -page{ - background: rgb(240, 239, 245) -} -.index_img{ - width: 100%; -} - -.body-box { - width: 100%; - display: flex; - flex-direction: row; - flex-wrap: wrap; - background: white; - padding-top: 20rpx; - padding-bottom: 20rpx; -} -.ico { - width: 25%; - display: flex; - flex-direction: column; - align-items: center; - font-size: 12px; - box-sizing: border-box; - padding-bottom: 10px; - padding-top: 10px; -} - -.ico image { - width: 90rpx; - height: 90rpx; - margin-bottom: 10rpx; -} \ No newline at end of file diff --git a/pages/message/message.js b/pages/message/message.js new file mode 100644 index 0000000..cbe2eac --- /dev/null +++ b/pages/message/message.js @@ -0,0 +1,66 @@ +// pages/message/message.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/index/index.json b/pages/message/message.json similarity index 100% rename from pages/index/index.json rename to pages/message/message.json diff --git a/pages/message/message.wxml b/pages/message/message.wxml new file mode 100644 index 0000000..324a389 --- /dev/null +++ b/pages/message/message.wxml @@ -0,0 +1,2 @@ + +pages/message/message.wxml diff --git a/pages/message/message.wxss b/pages/message/message.wxss new file mode 100644 index 0000000..2251458 --- /dev/null +++ b/pages/message/message.wxss @@ -0,0 +1 @@ +/* pages/message/message.wxss */ \ No newline at end of file diff --git a/pages/my/my.js b/pages/my/my.js index 2a8cba2..698e60b 100644 --- a/pages/my/my.js +++ b/pages/my/my.js @@ -5,6 +5,9 @@ Page({ * 页面的初始数据 */ data: { + meName: "", + mePhone: 0, + avatarUrl: "../../imgs/avatarUrl.png" }, diff --git a/pages/my/my.wxml b/pages/my/my.wxml index ddba981..4928c59 100644 --- a/pages/my/my.wxml +++ b/pages/my/my.wxml @@ -1 +1,16 @@ + + + + + + {{meName}}李丽丽 + {{mePhone}}1234567890 + + + + +设置 + + + \ No newline at end of file diff --git a/pages/my/my.wxss b/pages/my/my.wxss index 1c3fe88..87d0054 100644 --- a/pages/my/my.wxss +++ b/pages/my/my.wxss @@ -1 +1,53 @@ -/* pages/my/my.wxss */ \ No newline at end of file +/* pages/my/my.wxss */ + +page { + background:#EAF1F8; +} + +.view_me_main { + display: flex; + flex-direction: row; + background: #2689f8; + padding-top: 40rpx; + padding-left: 5%; + padding-bottom: 40rpx; +} + +.userinfo-avatar { + width: 128rpx; + height: 128rpx; + border-radius: 50%; +} + +.view_me_infos { + display: flex; + flex-direction: column; + justify-content: center; + padding-left: 30rpx; +} + +.view_me_text { + font-size: 32rpx; + color: white; + margin-top: 10rpx; +} + +.unregirst { + font-size: 32rpx; + text-align: left; + background: white; + padding-left: 20rpx; + padding-top: 20rpx; + padding-bottom: 20rpx; + margin-top: 20rpx; + color: #353535; +} + +.unregirstImage{ + height: 30rpx; + width: 30rpx; + padding-top: 10rpx; + padding-bottom: 15rpx; + position: absolute; + right: 20rpx; +} \ No newline at end of file diff --git a/pages/navigation/navigation.js b/pages/navigation/navigation.js deleted file mode 100644 index bf3ecb9..0000000 --- a/pages/navigation/navigation.js +++ /dev/null @@ -1,135 +0,0 @@ -// pages/navigation/navigation.js -var network = require("../../utils/net.js") -var app = getApp() - -var getBindCustomer = '/MainSystem/B3WeChatMiniProgram/Rpcs/CommonRpc/GetBindCustomer'; -var getMiniOpenId = '/MainSystem/B3WeChatMiniProgram/Rpcs/CommonRpc/GetMiniOpenIdByCode'; -var isBindedPath = '/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/AccountRpc/IsBinded'; - -function GetBindCustomer(that) { - let method = getBindCustomer; - let params = [app.globalData.AppId, app.globalData.OpenId]; - network.requestLoading(method, params, function(res) { - if (res.result != null) { - app.globalData.CustomerId = res.result.ID; - app.globalData.PhoneNum = res.result.WeixinUser_Phone; - IsBinded(); - } - }, function(res) { - wx.redirectTo({ - url: '/pages/selectCustomer/selctCustomer', - }) - }) - -} - -function WeixinLogin() { - let method = app.globalData.LoginPath; - let params = [app.globalData.AppId, app.globalData.OpenId]; - - network.transfer_request(method, params, function(res) { - app.globalData.DecryptCookie = res.result; - }) -} - - -function IsBinded() { - let method = isBindedPath - let params = [app.globalData.OpenId]; - network.transfer_request(method, params, function(res) { - if (res.result != "") { - app.globalData.PhoneNum = res.result; - - WeixinLogin(); - wx.switchTab({ - url: '/pages/main/main', - }) - - } else { - wx.redirectTo({ - url: '/pages/index/index', - }) - } - }) -} - - -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function(options) { - var that = this; - - wx.login({ - success: function(res) { - let code = res.code; - let method = getMiniOpenId; - let params = [app.globalData.AppId, code]; - - network.requestLoading(method, params, function(res) { - app.globalData.OpenId = res.result; - GetBindCustomer(that) - }) - } - }) - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function() { - - } -}) \ No newline at end of file diff --git a/pages/navigation/navigation.json b/pages/navigation/navigation.json deleted file mode 100644 index 9e26dfe..0000000 --- a/pages/navigation/navigation.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/pages/navigation/navigation.wxml b/pages/navigation/navigation.wxml deleted file mode 100644 index 3b2b08f..0000000 --- a/pages/navigation/navigation.wxml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/pages/navigation/navigation.wxss b/pages/navigation/navigation.wxss deleted file mode 100644 index 35745b6..0000000 --- a/pages/navigation/navigation.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/navigation/navigation.wxss */ \ No newline at end of file diff --git a/pages/saleForecastList/saleForecastList.js b/pages/saleForecastList/saleForecastList.js index 926d687..7042223 100644 --- a/pages/saleForecastList/saleForecastList.js +++ b/pages/saleForecastList/saleForecastList.js @@ -155,8 +155,8 @@ Page({ onShow: function (options) { this.setData({ - checkedDataArr: [], - unCheckDataArr: [], + checkedDataArr: [1,2,3], + unCheckDataArr: [1,2,3], Customer_ID: app.globalData.SelectCustomer_ID, }) var that = this; @@ -168,10 +168,10 @@ Page({ }); } }); - UnCheckPageIndex = 0; - CheckedPageIndex = 0; - getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize); - getCheckedOrderList(that, CheckedPageIndex, CheckedPageSize); + // UnCheckPageIndex = 0; + // CheckedPageIndex = 0; + // getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize); + // getCheckedOrderList(that, CheckedPageIndex, CheckedPageSize); }, /** diff --git a/pages/selectCustomer/selctCustomer.js b/pages/selectCustomer/selctCustomer.js deleted file mode 100644 index 550fa4c..0000000 --- a/pages/selectCustomer/selctCustomer.js +++ /dev/null @@ -1,97 +0,0 @@ -var network = require("../../utils/net.js") -var app = getApp() - - -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function(options) { - var that = this; - - - let method = '/MainSystem/B3WeChatMiniProgram/Rpcs/CustomerRpc/GetList'; - let params = []; - - network.requestLoading(method, params, function(res) { - that.setData({ - array: res.result, - }) - }) - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function() { - - }, - itemclick: function(e) { - let ID = e.currentTarget.dataset.data.ID; - let Name = e.currentTarget.dataset.data.Name; - wx.showModal({ - title: '提示', - content: '是否确定选择' + Name, - success: function(res) { - if (res.cancel) { - - } else { - app.globalData.CustomerId = ID; - wx.redirectTo({ - url: '/pages/index/index', - }) - } - }, - }) - } -}) \ No newline at end of file diff --git a/pages/selectCustomer/selctCustomer.json b/pages/selectCustomer/selctCustomer.json deleted file mode 100644 index 58ab434..0000000 --- a/pages/selectCustomer/selctCustomer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "navigationBarTitleText": "选择企业" -} \ No newline at end of file diff --git a/pages/selectCustomer/selctCustomer.wxml b/pages/selectCustomer/selctCustomer.wxml deleted file mode 100644 index 2e7c765..0000000 --- a/pages/selectCustomer/selctCustomer.wxml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - {{item.Name}} - - - - - - diff --git a/pages/selectCustomer/selctCustomer.wxss b/pages/selectCustomer/selctCustomer.wxss deleted file mode 100644 index a25df2e..0000000 --- a/pages/selectCustomer/selctCustomer.wxss +++ /dev/null @@ -1,26 +0,0 @@ -page { - background: rgb(240, 239, 245); -} - -.custmer_list_view{ - display: flex; - flex-direction: column; - padding-left: 5%; - padding-top: 16rpx; - padding-bottom: 16rpx; - background: white; -} - -.text_name{ - font-size: 40rpx; - color: rgb(48, 48, 48); -} - -.view_line_main{ - background: white -} -.view_line{ - width: 100%; - height: 2rpx; - background: rgb(219, 219, 219); -} \ No newline at end of file