From b0b0bd656a17db2a9fb8f50906178e0338a975b0 Mon Sep 17 00:00:00 2001 From: renjianbo <263303411@qq.com> Date: Sun, 28 May 2023 12:17:26 +0800 Subject: [PATCH] =?UTF-8?q?2023/5/23=E8=B0=83=E8=AF=95=E5=8C=BB=E9=99=A2?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 5 +- pages/guanyu/guanyu.js | 149 ++++++++++ pages/guanyu/guanyu.json | 13 + pages/guanyu/guanyu.wxml | 20 ++ pages/guanyu/guanyu.wxss | 169 +++++++++++ pages/index/index.js | 373 ++++++++++++----------- pages/my/my.js | 461 ++++++++++++++--------------- pages/my/my.json | 3 +- pages/my/my.wxml | 15 +- pages/tuiguang/extensionInfor.js | 115 +++---- pages/tuiguang/extensionInfor.json | 8 - pages/tuiguang/extensionInfor.wxml | 57 +--- pages/tuiguang/extensionInfor.wxss | 204 ------------- pages/tuiguang/tuiguang.js | 60 ---- pages/tuiguang/tuiguang.json | 8 - pages/tuiguang/tuiguang.wxml | 50 ---- pages/tuiguang/tuiguang.wxss | 176 ----------- pages/webpage/webpage.js | 15 + pages/webpage/webpage.json | 3 + pages/webpage/webpage.wxml | 2 + pages/webpage/webpage.wxss | 1 + 21 files changed, 877 insertions(+), 1030 deletions(-) create mode 100644 pages/guanyu/guanyu.js create mode 100644 pages/guanyu/guanyu.json create mode 100644 pages/guanyu/guanyu.wxml create mode 100644 pages/guanyu/guanyu.wxss delete mode 100644 pages/tuiguang/extensionInfor.json delete mode 100644 pages/tuiguang/extensionInfor.wxss delete mode 100644 pages/tuiguang/tuiguang.js delete mode 100644 pages/tuiguang/tuiguang.json delete mode 100644 pages/tuiguang/tuiguang.wxml delete mode 100644 pages/tuiguang/tuiguang.wxss create mode 100644 pages/webpage/webpage.js create mode 100644 pages/webpage/webpage.json create mode 100644 pages/webpage/webpage.wxml create mode 100644 pages/webpage/webpage.wxss diff --git a/app.json b/app.json index 3e6e501..9a9ec6d 100644 --- a/app.json +++ b/app.json @@ -3,7 +3,6 @@ "pages/index/index", "pages/peihu/peihu", "pages/tuiguang/extensionInfor", - "pages/tuiguang/tuiguang", "pages/my/my", "pages/order/order", "pages/order/re_orderdetail", @@ -13,7 +12,9 @@ "pages/wodeqianbao/qianbao", "pages/refund/refund", "pages/peizhen/peizhen", - "pages/peizhen/peizhendetail" + "pages/peizhen/peizhendetail", + "pages/guanyu/guanyu", + "pages/webpage/webpage" ], "window": { "backgroundTextStyle": "light", diff --git a/pages/guanyu/guanyu.js b/pages/guanyu/guanyu.js new file mode 100644 index 0000000..dd919e2 --- /dev/null +++ b/pages/guanyu/guanyu.js @@ -0,0 +1,149 @@ +const app = getApp() + +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + bindNameInput: function (e) { + this.setData({ + name: e.detail.value + }) + }, + bindPhoneInput: function (e) { + this.setData({ + jzphone: e.detail.value + }) + }, + bindAdressInput: function (e) { + this.setData({ + address: e.detail.value + }) + }, + + // 确认支付 + confirm_payy: async function () { + // wx.showToast({ + // title: '点击了', + // icon: 'none' + // }); + var that = this; + if (!this.data.is_ok_click) { + that.setData({ + is_ok_click: true + }) + //你要执行的操作 + this.payment() + setTimeout(function () { + that.setData({ + is_ok_click: false + }) + }, 10000) //阻止一秒点击多次 + } else { + // wx.showToast({ title:'请勿重复操作！', icon: 'none' }); + } + }, + + onClose() { + this.setData({ + show: false + }); + }, + + xieyi(e){ + wx.navigateTo({ + url: "/pages/webpage/webpage?url=" + 'http:www.baidu.com' // 解码 + }) + }, + + // goDoc(e){ + // const staticDoc = { + // "aa": "https://xxxx.com/aa.html?type=bb" + // } + // let doc = e.currentTarget.dataset.doc; + // wx.navigateTo({ + // url: "/pages/webview/index?url=" + encodeURIComponent(staticDoc[doc]) // 解码 + // }) + // } + + + + bindDateChange: function (e) { + this.setData({ + seckill_start: e.detail.value + }) + }, + + onClickLeft() { + wx.navigateBack() + }, + onChange(e) { + this.setData({ + timeData: e.detail, + }); + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (e) { + var statusBarHeight = wx.getSystemInfoSync().statusBarHeight; + this.setData({ + statusBarHeight: statusBarHeight, + height: 46 + statusBarHeight, + }); + + + }, + + + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + }, + + +}) \ No newline at end of file diff --git a/pages/guanyu/guanyu.json b/pages/guanyu/guanyu.json new file mode 100644 index 0000000..a55c847 --- /dev/null +++ b/pages/guanyu/guanyu.json @@ -0,0 +1,13 @@ +{ + "usingComponents": { + "van-count-down": "/miniprogram/miniprogram_npm/@vant/weapp/count-down/index", + "van-switch": "/miniprogram/miniprogram_npm/@vant/weapp/switch/index", + "van-button": "/miniprogram/miniprogram_npm/@vant/weapp/button/index", + "van-calendar": "/miniprogram/miniprogram_npm/@vant/weapp/calendar/index", + "van-cell": "/miniprogram/miniprogram_npm/@vant/weapp/cell/index", + "van-action-sheet": "/miniprogram/miniprogram_npm/@vant/weapp/action-sheet/index", + "van-nav-bar":"/miniprogram/miniprogram_npm/@vant/weapp/nav-bar/index", + "van-field": "/miniprogram/miniprogram_npm/@vant/weapp/field/index" + }, + "navigationBarTitleText": "下单" +} \ No newline at end of file diff --git a/pages/guanyu/guanyu.wxml b/pages/guanyu/guanyu.wxml new file mode 100644 index 0000000..b4425b5 --- /dev/null +++ b/pages/guanyu/guanyu.wxml @@ -0,0 +1,20 @@ + + + + + + 当前版本 + + 1.0.0 + + + + 隐私协议 + + + + + + 西安瑞来兹提供技术支持 + + \ No newline at end of file diff --git a/pages/guanyu/guanyu.wxss b/pages/guanyu/guanyu.wxss new file mode 100644 index 0000000..abdae62 --- /dev/null +++ b/pages/guanyu/guanyu.wxss @@ -0,0 +1,169 @@ +/* pages/goddess/goddess.wxss */ + +page{ + background: #F8F8F8; +} +image { + width: 100%; + height: 100%; + +} + +.Category { + display: flex; +} + +.Category .Price { + width: 449rpx; + height: 107rpx; + background: #FF4C00; + display: flex; +} +.card_cont{ + display: flex; + flex-direction: column; + background: #fff; + width: 85%; + margin: 0 auto; + margin-top: 0rpx; + box-shadow: 0px 0px 6px rgba(152, 152, 152, 0.16); + border-radius: 10rpx; + padding: 20rpx; +} + +.card_con{ + display: flex; + flex-direction: column; + background: #fff; + border-radius: 10rpx; + margin-left: 40rpx; + margin-right: 40rpx; +} +.card_cont_top{ + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; +} +.card_top_left{ + color: #E54F54; + font-size: 36rpx; +} +.card_top_left text:first-child{ + font-size: 55rpx; + padding: 0 20rpx 0 0; + /* border: 1px solid red; */ +} +.card_top_left text:last-child{ + font-size: 24rpx; +} +.Price .Price-left { + margin: 8rpx 0 0 32rpx; +} + +.Price .Price-left text:nth-child(1) { + font-size: 34rpx; + color: #FFFFFF; + font-weight: 700; + line-height: 48rpx; +} + +.Price .Price-left text:nth-child(2) { + font-size: 24rpx; + color: #FFFFFF; + text-decoration: line-through; + margin-left: 5rpx; +} + +/* 销售 */ +.Category .Price .sale { + font-size: 26rpx; + color: #FFFFFF; +} + +/* 库存 */ +.Category .Price .stock { + font-size: 24rpx; + color: #FFFFFF; + margin: 16rpx 0 0 33rpx; +} + + + + + .content .tejia .Price2 { + font-size: 30rpx; + color: #666666; + line-height: 41rpx; + margin-right: 23rpx; + } + + .peisong-way{ + width: 640rpx; + height: 128rpx; + background: #F6F6F6; + margin-right: 31rpx; + opacity: 1; + border-radius: 0px + } + + + .row-wrap .label{ + width: 200rpx; + color: #000; + margin-left: 6rpx; + } + .row-wrap .label-right{ + width: 500rpx; + height: 88rpx; + line-height: 88rpx; + text-align: right; + } + .row-wrap{ + width: 100%; + height: 100rpx; + line-height: 88rpx; + margin-left: 0rpx; + border-bottom: 1rpx solid #eee; + display: flex; + font-size: 28rpx; + /*justify-content: space-between;*/ + } + .row-wrap{ + width: 100%; + height: 100rpx; + line-height: 88rpx; + margin-left: 0rpx; + border-bottom: 1rpx solid #eee; + display: flex; + font-size: 28rpx; + /*justify-content: space-between;*/ + } + .row-wrap .label-right input{ + height: 100%; + font-size: 28rpx; + padding-right: 30rpx; + } + + + /*选择器 */ +.section__title{ + margin-bottom: 20rpx; +} +.section{ + margin: 50rpx 0; + font-size: 30rpx; +} + + +.copyright { + width: 100%; + font-size: 28rpx; + color: #999; + position: fixed; + bottom: 0; + left: 0; + right: 0; + padding: 30rpx 0 25rpx 0rpx; + text-align: center; +} \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index a365f80..edd76ab 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -2,115 +2,128 @@ var app = getApp(); Page({ - /** - * 页面的初始数据00 - */ - data: { - order_list: [], - bannerdata:[ - "home-banner", - "home-banner", - "home-banner" - ], - itemView: [ - { - icon: "全程陪诊", - title: "全程陪诊", - price:"200", - describe:"服务内容：排队 预约 挂号 缴费 取药 记录医嘱", - ordertype:"1" - }, - { - icon: "诊前约号", - title: "诊前约号", - price:"20", - describe:"服务内容：协助办理完成挂号", - ordertype:"2" - }, - // { - // icon: "代办买药", - // title: "代办买药", - // price:"30", - // describe:"服务内容：协助代理买药" - // }, - { - icon: "代办问诊", - title: "代办问诊", - price:"100", - describe:"服务内容：使用病人或者家属取检查报告化验单向医生问明情况", - ordertype:"4" - }, - { - icon: "取送结果", - title: "取送结果", - price:"50", - describe:"服务内容：包括给病人或者家属取检查报告化验单等", - ordertype:"3" - }, - // { - // icon: "出入院办理", - // title: "出入院办理", - // price:"100", - // describe:"协助办理出入院手续" - // } - ], - hospitalData: [ - { - img: "https://bkimg.cdn.bcebos.com/pic/8326cffc1e178a828fa58d64f303738da877e85d?x-bce-process=image/resize,m_lfit,w_536,limit_1", - name: "西安市高新医院", - grade: "三甲", - genre: "综合医院", - skiled: "消化内科、心血管内科", - address: "高新区高新六路", - id: "1" - },{ - img: "https://bkimg.cdn.bcebos.com/pic/8326cffc1e178a828fa58d64f303738da877e85d?x-bce-process=image/resize,m_lfit,w_536,limit_1", - name: "第四军医大学西京医院", - grade: "三甲", - genre: "综合医院", - skiled: "消化内科、心血管内科", - address: "莲湖区康复路", - id: "2" - },{ - img: "https://bkimg.cdn.bcebos.com/pic/8326cffc1e178a828fa58d64f303738da877e85d?x-bce-process=image/resize,m_lfit,w_536,limit_1", - name: "陕西省人民医院", - grade: "三甲", - genre: "综合医院", - skiled: "消化内科、心血管内科", - address: "碑林区友谊西路", - id: "3" - } - ] - }, - - /** - * 诊前约号、代办买药、取送结果、出入院办理、就医陪诊、园内护理 - */ - itemClick (options) { - // console.log(options.currentTarget.dataset.id) - - let item = JSON.stringify(options.currentTarget.dataset.item); - // console.log("传递的item" + item); - console.log("传递的item" + item); - wx.navigateTo({ + /** + * 页面的初始数据00 + */ + data: { + order_list: [], + bannerdata: [ + "home-banner", + "home-banner", + "home-banner" + ], + itemView: [{ + icon: "全程陪诊", + title: "全程陪诊", + price: "200", + describe: "服务内容：排队 预约 挂号 缴费 取药 记录医嘱", + ordertype: "1" + }, + { + icon: "诊前约号", + title: "诊前约号", + price: "20", + describe: "服务内容：协助办理完成挂号", + ordertype: "2" + }, + // { + // icon: "代办买药", + // title: "代办买药", + // price:"30", + // describe:"服务内容：协助代理买药" + // }, + { + icon: "代办问诊", + title: "代办问诊", + price: "100", + describe: "服务内容：使用病人或者家属取检查报告化验单向医生问明情况", + ordertype: "4" + }, + { + icon: "取送结果", + title: "取送结果", + price: "50", + describe: "服务内容：包括给病人或者家属取检查报告化验单等", + ordertype: "3" + }, + // { + // icon: "出入院办理", + // title: "出入院办理", + // price:"100", + // describe:"协助办理出入院手续" + // } + ], + hospitalData: [{ + img: "https://bkimg.cdn.bcebos.com/pic/8326cffc1e178a828fa58d64f303738da877e85d?x-bce-process=image/resize,m_lfit,w_536,limit_1", + name: "西安市高新医院", + grade: "三甲", + genre: "综合医院", + skiled: "消化内科、心血管内科", + address: "高新区高新六路", + id: "1" + }, { + img: "https://bkimg.cdn.bcebos.com/pic/8326cffc1e178a828fa58d64f303738da877e85d?x-bce-process=image/resize,m_lfit,w_536,limit_1", + name: "第四军医大学西京医院", + grade: "三甲", + genre: "综合医院", + skiled: "消化内科、心血管内科", + address: "莲湖区康复路", + id: "2" + }, { + img: "https://bkimg.cdn.bcebos.com/pic/8326cffc1e178a828fa58d64f303738da877e85d?x-bce-process=image/resize,m_lfit,w_536,limit_1", + name: "陕西省人民医院", + grade: "三甲", + genre: "综合医院", + skiled: "消化内科、心血管内科", + address: "碑林区友谊西路", + id: "3" + }] + }, + + /** + * 诊前约号、代办买药、取送结果、出入院办理、就医陪诊、园内护理 + */ + itemClick(options) { + + if (wx.getStorageSync('phone') == '') { + wx.setStorageSync('uidFlag', false); + console.log('请登录') + this.isdenglu() + } else { + // console.log(options.currentTarget.dataset.id) + let item = JSON.stringify(options.currentTarget.dataset.item); + // console.log("传递的item" + item); + console.log("传递的item" + item); + wx.navigateTo({ // url: "/pages/peizhen/peizhendetail?servername=" + options.currentTarget.dataset.id, - url: "/pages/peizhen/peizhendetail?item=" + item, - - }); - }, + url: "/pages/peizhen/peizhendetail?item=" + item, + }); + } + }, - - go_peizhen(){ + go_peizhen() { + if (wx.getStorageSync('phone') == '') { + wx.setStorageSync('uidFlag', false); + console.log('请登录') + this.isdenglu() + } else { wx.navigateTo({ url: '/pages/peizhen/peizhen', }) - }, - - go_peihu(){ + } + }, + + go_peihu() { + if (wx.getStorageSync('phone') == '') { + wx.setStorageSync('uidFlag', false); + console.log('请登录') + this.isdenglu() + } else { wx.navigateTo({ url: '/pages/peihu/peihu?' + "hospitalId=" + "", }) - }, + } + }, //获取医院列表 getHospitalList: function () { var that = this; @@ -118,11 +131,10 @@ Page({ url: app.globalData.url + '/system/hospital/list', header: app.getRequestHeader(), method: 'GET', - data: { - }, + data: {}, success: (res) => { var resp = res.data; - console.log("resp==" +resp) + console.log("resp==" + resp) if (res.data.code == 200) { if (this.data.pageNum == 1) { that.setData({ @@ -133,78 +145,101 @@ Page({ } else { that.setData({ order_list: resp.data, - + }); } } } }); }, - /** - * 医院列表 - */ - listItemTap(options){ - console.log(options.currentTarget.dataset.id), + /** + * 医院列表 + */ + listItemTap(options) { + // console.log(options.currentTarget.dataset.id), + if (wx.getStorageSync('phone') == '') { + wx.setStorageSync('uidFlag', false); + console.log('请登录') + this.isdenglu() + } else { wx.navigateTo({ url: '/pages/peihu/peihu?' + "hospitalId=" + options.currentTarget.dataset.id, }) - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - this.getHospitalList() - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - } - }) \ No newline at end of file + }, + + //是否登录 + isdenglu() { + wx.showModal({ + title: '提示', + content: '请先登录', + success(res) { + if (res.confirm) { + console.log('用户点击确定') + wx.switchTab({ + url: '/pages/my/my' + }) + } else if (res.cancel) { + console.log('用户点击取消') + } + } + }) + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + this.getHospitalList() + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/my/my.js b/pages/my/my.js index 231a57e..4d1493a 100644 --- a/pages/my/my.js +++ b/pages/my/my.js @@ -4,251 +4,244 @@ const app = getApp() Page({ - /** - * 页面的初始数据 - */ - data: { - canIUseOpenData: wx.canIUse('open-data.type.userAvatarUrl') && wx.canIUse('open-data.type.userNickName'), - phone: wx.getStorageSync('phone'), - uidFlag:wx.getStorageSync('uidFlag'), - status: '', - code: '', - height: '' - }, + /** + * 页面的初始数据 + */ + data: { + canIUseOpenData: wx.canIUse('open-data.type.userAvatarUrl') && wx.canIUse('open-data.type.userNickName'), + phone: wx.getStorageSync('phone'), + uidFlag: wx.getStorageSync('uidFlag'), + status: '', + code: '', + height: '' + }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - var statusBarHeight = wx.getSystemInfoSync().statusBarHeight; - app.console(statusBarHeight + "=================xxxxxxxxxxxxxxxxxxxxxxxx") - this.setData({ - statusBarHeight: statusBarHeight, - height: 46 + statusBarHeight, - }); - app.console(this.data.height + "=================xxxxxxxxxxxxxxxxxxxxxxxx") - //调试参数 - // wx.setStorageSync('phone', 18133922183); - // wx.setStorageSync('uid', 'adfdffb45a364fc23162f1ebfe9dd66f'); - // wx.setStorageSync('token', '797d4q7XT8/PM9bU+T+CNpEpNfsWeVb5j+eXnrRXW0yq+wKXY9fBNSvb7qPiCRMlzZmwG3u1ods8R8Rh3gITxCkyiZGUtLZf'); - // wx.setStorageSync('uidFlag', true); - }, - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - this.getLogin() - console.log("code==" + this.data.code) - // if (wx.getStorageSync('phone') != '') { - // this.getUserBaseInfo() - // } - }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + var statusBarHeight = wx.getSystemInfoSync().statusBarHeight; + app.console(statusBarHeight + "=================xxxxxxxxxxxxxxxxxxxxxxxx") + this.setData({ + statusBarHeight: statusBarHeight, + height: 46 + statusBarHeight, + }); + app.console(this.data.height + "=================xxxxxxxxxxxxxxxxxxxxxxxx") + //调试参数 + // wx.setStorageSync('phone', 18133922183); + // wx.setStorageSync('uid', 'adfdffb45a364fc23162f1ebfe9dd66f'); + // wx.setStorageSync('token', '797d4q7XT8/PM9bU+T+CNpEpNfsWeVb5j+eXnrRXW0yq+wKXY9fBNSvb7qPiCRMlzZmwG3u1ods8R8Rh3gITxCkyiZGUtLZf'); + // wx.setStorageSync('uidFlag', true); + }, + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + this.getLogin() + console.log("code==" + this.data.code) + // if (wx.getStorageSync('phone') != '') { + // this.getUserBaseInfo() + // } + }, - // 登录 - getLogin() { - var that = this; - wx.login({ - success: res => { - console.log(res) - app.globalData.code = res.code - that.setData({ - code: res.code - }) - } + // 登录 + getLogin() { + var that = this; + wx.login({ + success: res => { + console.log(res) + app.globalData.code = res.code + that.setData({ + code: res.code }) - }, - // 获取电话号码 - getPhoneNumber(e) { + } + }) + }, + // 获取电话号码 + getPhoneNumber(e) { - console.log("encryptedData==" + e.detail.encryptedData) - console.log("iv==" + e.detail.iv) - console.log("wxcode==" + app.globalData.code) + console.log("encryptedData==" + e.detail.encryptedData) + console.log("iv==" + e.detail.iv) + console.log("wxcode==" + app.globalData.code) - var _this = this; - console.log(e) - wx.request({ - url: app.globalData.url + '/weixinLogin', - data: { - encryptedData: e.detail.encryptedData, - iv: e.detail.iv, - wxcode: app.globalData.code - }, - method: 'POST', - header: { - 'content-type': 'application/x-www-form-urlencoded' - }, - success(res) { - if (res.data.code == 200) { - app.globalData.phone = res.data.phone; - wx.setStorageSync('phone', res.data.data.phoneNumber); - wx.setStorageSync('uid', res.data.data.userId); - wx.setStorageSync('token', res.data.data.token); - wx.setStorageSync('uidFlag', true); - _this.setData({ - uidFlag: true, - phone: res.data.phone - }) - app.globalData.uid = res.data.uid; - wx.switchTab({ - url: '/pages/index/index' - }) - // Token.token() - _this.getToken() + var _this = this; + console.log(e) + wx.request({ + url: app.globalData.url + '/weixinLogin', + data: { + encryptedData: e.detail.encryptedData, + iv: e.detail.iv, + wxcode: app.globalData.code + }, + method: 'POST', + header: { + 'content-type': 'application/x-www-form-urlencoded' + }, + success(res) { + if (res.data.code == 200) { + app.globalData.phone = res.data.phone; + wx.setStorageSync('phone', res.data.data.phoneNumber); + wx.setStorageSync('uid', res.data.data.userId); + wx.setStorageSync('token', res.data.data.token); + wx.setStorageSync('uidFlag', true); + _this.setData({ + uidFlag: true, + phone: res.data.phone + }) + app.globalData.uid = res.data.uid; + wx.switchTab({ + url: '/pages/index/index' + }) + // Token.token() + _this.getToken() - _this.ceshi() + _this.ceshi() - wx.showToast({ - title: res.data.msg, - icon: 'none' - }); - - - } else { - wx.showToast({ - title: res.data.msg, - icon: 'none' - }); - - } - } - }) - }, - //上传测试数据 - ceshi() { - - wx.request({ - url: app.buildUrltwo("/member/logintwo"), - header: app.getRequestHeader(), - method: "POST", - data: { - name: wx.getStorageSync('uid'), - phone: wx.getStorageSync('phone'), - storename: wx.getStorageSync('token') - - }, - success: function (res) { - var resp = res.data; - if (resp.code != 200) { - app.alert({ - "content": resp.msg - }); - return; - } - // 跳转 - wx.navigateBack({}); - } - }) - }, - //获取token - getUserBaseInfo: function () { - var that = this; - //假数据 - // if (this.data.resp.erro == 0) { - // that.setData({ - // infor: this.data.resp.infor - // }); - // } - wx.request({ - url: app.globalData.url + '/getUserToken', - header: app.getRequestHeader(), - method: 'GET', - data: { - phonenumber: '18133922183' - }, - success: function (res) { - var resp = res.data; - console.log(resp + "=================dddddddddddddddddddddddddddddddddddddddddddd") - console.log(resp.erro + "=================dddddddddddddddddddddddddddddddddddddddddddd") - if (resp.erro == 0) { - - that.setData({ - infor: resp.infor - }); - } - } - }); - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - }, - shoucang() { - wx.navigateTo({ - url: '/pages/myshoucang/myshoucang_index?' + "type=" + "1", - }) - }, - pintuan() { - wx.navigateTo({ - // url: '/pages/myshoucang/myshoucang_index?'+"type="+"2", - url: '/pages/order/order', - - }) - }, - - kanjia() { - // wx.navigateTo({ - // url: '/pages/myshoucang/myshoucang_index?'+"type="+"3", - // }) - wx.showToast({ - title: '暂无开放', + wx.showToast({ + title: res.data.msg, icon: 'none' - }); - }, - qianbao() { - wx.navigateTo({ - url: '/pages/wodeqianbao/qianbao' - }) - }, - tuiguang() { + }); + - if (this.data.status == 1) { - wx.navigateTo({ - url: '/pages/tuiguang/extensionInfor' - }) } else { - wx.navigateTo({ - url: '/pages/tuiguang/tuiguang' - }) + wx.showToast({ + title: res.data.msg, + icon: 'none' + }); + } - }, + } + }) + }, + //上传测试数据 + ceshi() { + + wx.request({ + url: app.buildUrltwo("/member/logintwo"), + header: app.getRequestHeader(), + method: "POST", + data: { + name: wx.getStorageSync('uid'), + phone: wx.getStorageSync('phone'), + storename: wx.getStorageSync('token') + + }, + success: function (res) { + var resp = res.data; + if (resp.code != 200) { + app.alert({ + "content": resp.msg + }); + return; + } + // 跳转 + wx.navigateBack({}); + } + }) + }, + //获取token + getUserBaseInfo: function () { + var that = this; + //假数据 + // if (this.data.resp.erro == 0) { + // that.setData({ + // infor: this.data.resp.infor + // }); + // } + wx.request({ + url: app.globalData.url + '/getUserToken', + header: app.getRequestHeader(), + method: 'GET', + data: { + phonenumber: '18133922183' + }, + success: function (res) { + var resp = res.data; + console.log(resp + "=================dddddddddddddddddddddddddddddddddddddddddddd") + console.log(resp.erro + "=================dddddddddddddddddddddddddddddddddddddddddddd") + if (resp.erro == 0) { + + that.setData({ + infor: resp.infor + }); + } + } + }); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + }, + shoucang() { + wx.navigateTo({ + url: '/pages/myshoucang/myshoucang_index?' + "type=" + "1", + }) + }, + pintuan() { + wx.navigateTo({ + // url: '/pages/myshoucang/myshoucang_index?'+"type="+"2", + url: '/pages/order/order', + + }) + }, + + kanjia() { + // wx.navigateTo({ + // url: '/pages/myshoucang/myshoucang_index?'+"type="+"3", + // }) + wx.showToast({ + title: '暂无开放', + icon: 'none' + }); + }, + qianbao() { + wx.navigateTo({ + url: '/pages/wodeqianbao/qianbao' + }) + }, + guanyu() { + wx.navigateTo({ + url: '/pages/guanyu/guanyu' + }) + }, }) \ No newline at end of file diff --git a/pages/my/my.json b/pages/my/my.json index 71b9e4c..a62de97 100644 --- a/pages/my/my.json +++ b/pages/my/my.json @@ -1,6 +1,7 @@ { "usingComponents": { - "van-nav-bar":"/miniprogram/miniprogram_npm/@vant/weapp/nav-bar/index" + "van-nav-bar":"/miniprogram/miniprogram_npm/@vant/weapp/nav-bar/index", + "van-icon": "/miniprogram/miniprogram_npm/@vant/weapp/icon/index" }, "navigationBarTitleText": "我的" } \ No newline at end of file diff --git a/pages/my/my.wxml b/pages/my/my.wxml index 84347cb..f3480b7 100644 --- a/pages/my/my.wxml +++ b/pages/my/my.wxml @@ -21,7 +21,7 @@ - + - - + diff --git a/pages/tuiguang/extensionInfor.js b/pages/tuiguang/extensionInfor.js index 511b32f..c9f4e39 100644 --- a/pages/tuiguang/extensionInfor.js +++ b/pages/tuiguang/extensionInfor.js @@ -1,63 +1,66 @@ -// index.js -// 获取应用实例 -const app = getApp() - +// pages/tuiguang/extensionInfor.js Page({ - data: { - sku_pic:'/pages/image/tuiguang_bj.png', - beijing:'/pages/image/tuiguang_i.png', - motto: 'Hello World', - title: '你好，\n欢迎来到蜜芽商户端', - userInfo: {}, - hasUserInfo: false, - canIUse: wx.canIUse('button.open-type.getUserInfo'), - canIUseGetUserProfile: false, - canIUseOpenData: wx.canIUse('open-data.type.userAvatarUrl') && wx.canIUse('open-data.type.userNickName') ,// 如需尝试获取用户信息可改为false - regFlag:false, - input_phone: '13511112222', - // input_phone: '18133922183', - input_password: '123456', - - name:'', - phone:'', - hangye:'' - }, - back(){ - wx.navigateBack() -}, /** - * 推广用户的二维码和赏金数据 + * 页面的初始数据 */ - onLoad: function (options) { - this.applyExtension() + data: { + }, -applyExtension: function () { - var that = this; - wx.request({ - url: app.buildUrl("/app/Goddesswechat/getExtensionInfor"), - header: app.getRequestHeader(), - method:'POST', - data: { - version_number: app.globalData.version_number, - uid:wx.getStorageSync('uid'), - token:wx.getStorageSync('token'), - }, - success: function (res) { - var resp = res.data; - console.log(resp+"=================dddddddddddddddddddddddddddddddddddddddddddd") - if(resp.erro==0){ - that.setData({ - infro:resp.infro - }) - } - } - }); + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + }, - // 事件处理函数 - bindViewTap() { - wx.navigateTo({ - url: '../logs/logs' - }) + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + }, -}) + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/tuiguang/extensionInfor.json b/pages/tuiguang/extensionInfor.json deleted file mode 100644 index 9effe5f..0000000 --- a/pages/tuiguang/extensionInfor.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "usingComponents": { - - "van-overlay": "/miniprogram/miniprogram_npm/@vant/weapp/nav-bar/index" - }, - "navigationBarTitleText": "推广" -} - diff --git a/pages/tuiguang/extensionInfor.wxml b/pages/tuiguang/extensionInfor.wxml index f9415c6..43182da 100644 --- a/pages/tuiguang/extensionInfor.wxml +++ b/pages/tuiguang/extensionInfor.wxml @@ -1,55 +1,2 @@ - - - - - - - - - - - - - - - - - - - - - 将二维码分享给好友赚钱 - - - - - - - - - - - - 数据 - - - - - - - {{infro.day_money}} - 今日赏金（元） - - - - - - - {{infro.money_reward}} - 累计赏金（元） - - - - - - + +pages/tuiguang/extensionInfor.wxml diff --git a/pages/tuiguang/extensionInfor.wxss b/pages/tuiguang/extensionInfor.wxss deleted file mode 100644 index 010e060..0000000 --- a/pages/tuiguang/extensionInfor.wxss +++ /dev/null @@ -1,204 +0,0 @@ -/**index.wxss**/ - -page { - height: 100%; -} - - - - -.goods-listtwo{ - width:631rpx; - height: 200rpx; - background-color: #fff; - border-radius: 15px; - margin-left: 62rpx; -} - - - - .input-content{ - font-size: 28rpx; - color: #000; - padding: 10rpx 0 0rpx 0rpx; -} - - - -.peisong-way{ - width: 100%; - background-color: #fff; -} - -.peisong-way .row-box{ - margin-left: 80rpx; - margin-inline-end: 80rpx; - display: flex; - justify-content: space-between; - align-items: center; - box-sizing: border-box; - border-bottom: 1rpx solid #eee; -} - - -.copyright { - width: 100%; - font-size: 28rpx; - color: #B2B2B2; - position: fixed; - bottom: 0; - left: 0; - right: 0; - padding: 30rpx 0 50rpx 0rpx; - text-align: center; -} -.copyrightt { - width: 100%; - font-size: 28rpx; - color: #999; - position: fixed; - left: 0; - right: 0; - padding: 30rpx 0 25rpx 0rpx; - text-align: center; - width: 485rpx; - background: rgb(240, 102, 102); - display: flex; -flex-direction: row; -justify-content: center; - -} -.zc-text{ - color: #999; - font-size: 28rpx; - margin-right: 80rpx; - padding: 30rpx 0 25rpx 0rpx; -} -.wj-text{ - color: #999; - margin-left: 80rpx; - font-size: 28rpx; -} - -.confirm-btn { - font-size: 10pt; - line-height: 85rpx; - width: 485rpx; - height: 85rpx; - background: rgb(240, 102, 102); - color: #fff; - text-align: center; - border-radius: 100rpx; - -} - -.bd { - position: relative; - flex: 1; - display: flex; - flex-direction: column; - align-items: stretch; - animation: bd-rise 2s cubic-bezier(0.23,1,0.32,1) .75s forwards; - opacity: 0; -} - -.sdsdf{ - - display: flex; - width: 0rpx; - height: 56rpx; - background-color: white; - -} - -.yaotext{ - font-size: 34rpx; - color: #3E3E3E; - font-weight: bold; - display: flex; - position: relative; - justify-content: center; - padding-top: 50rpx; - -} -.row-wrap{ - width: 303rpx; - height: 303rpx; - display: flex; - font-size: 28rpx; - display: flex; - position: relative; - justify-content: center; - padding-top: 50rpx; -} - -.row-wrap .label{ - width: 200rpx; - color: #000; - margin-left: 33rpx; -} -.row-wrap .label-right{ - width: 100%; - height: 88rpx; - line-height: 88rpx; - text-align: right; - -} -.row-wrap .label-right input{ - height: 100%; - font-size: 28rpx; - padding-right: 30rpx; -} - -.home-item-box1{ - display:flex; - width: 340rpx; - height: 133rpx; - border-radius: 20rpx; - display:flex;background-color: white;margin-right: 10rpx;display: flex;flex-direction: row;justify-content: center; -} -.home-item-box2{ - display:flex; - width: 340rpx; - height: 133rpx; - border-radius: 20rpx; - display:flex;background-color: white;margin-left: 10rpx;display: flex;flex-direction: row;justify-content: center; -} - - -.home-item-tv3{ - display: flex;flex-direction: row;justify-content: center;color: #FF5042;font-size: 44rpx;margin-top: 21rpx; -} - -.home-item-tv4{ - display: flex;flex-direction: row;justify-content: center;font-size: 24rpx;color: #404040; -} - - -.containerrr{ - width:100%; - height: 400rpx; - border-radius: 15px; - position: relative; - -} - -.imagee_left{ - width:170rpx; - height: 90rpx; -} - -.imagee_right{ - width:250rpx; - height: 133rpx; -} - -.goods-list{ - width:631rpx; - height: 430rpx; - background-color: #fff; - border-radius: 15px; - margin-left: 60rpx; - - margin-top: -400rpx; -} \ No newline at end of file diff --git a/pages/tuiguang/tuiguang.js b/pages/tuiguang/tuiguang.js deleted file mode 100644 index b9dbbf0..0000000 --- a/pages/tuiguang/tuiguang.js +++ /dev/null @@ -1,60 +0,0 @@ -// index.js -// 获取应用实例 -const app = getApp() - -Page({ - data: { - motto: 'Hello World', - title: '你好，\n欢迎来到蜜芽商户端', - userInfo: {}, - hasUserInfo: false, - canIUse: wx.canIUse('button.open-type.getUserInfo'), - canIUseGetUserProfile: false, - canIUseOpenData: wx.canIUse('open-data.type.userAvatarUrl') && wx.canIUse('open-data.type.userNickName') ,// 如需尝试获取用户信息可改为false - - regFlag:false, - input_phone: '13511112222', - // input_phone: '18133922183', - input_password: '123456', - - name:'', - phone:'', - hangye:'' - }, - back(){ - wx.navigateBack() -}, - goToIndex: function () { - var that = this; - wx.request({ - url: app.buildUrl("/app/Goddesswechat/applyExtension"), - header: app.getRequestHeader(), - method:'POST', - data: { - version_number: app.globalData.version_number, - uid:wx.getStorageSync('uid'), - token:wx.getStorageSync('token'), - name:that.data.name, - phone:that.data.phone, - industry:that.data.hangye - }, - success: function (res) { - var resp = res.data; - console.log(resp+"=================dddddddddddddddddddddddddddddddddddddddddddd") - if(resp.erro==0){ - wx.showToast({ title: resp.msg, icon: 'none' }); - that.setData({ - - - }); - } - } - }); - }, - // 事件处理函数 - bindViewTap() { - wx.navigateTo({ - url: '../logs/logs' - }) - }, -}) diff --git a/pages/tuiguang/tuiguang.json b/pages/tuiguang/tuiguang.json deleted file mode 100644 index 9effe5f..0000000 --- a/pages/tuiguang/tuiguang.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "usingComponents": { - - "van-overlay": "/miniprogram/miniprogram_npm/@vant/weapp/nav-bar/index" - }, - "navigationBarTitleText": "推广" -} - diff --git a/pages/tuiguang/tuiguang.wxml b/pages/tuiguang/tuiguang.wxml deleted file mode 100644 index 0597e0e..0000000 --- a/pages/tuiguang/tuiguang.wxml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - 请填写相关信息 - - - - 姓名 - - - - - - - - - 电话 - - - - - - - - 行业 - - - - - - - 立即申请 - - 提交审核后，工作人员将在1-3个工作日内审核 - - - - - - - diff --git a/pages/tuiguang/tuiguang.wxss b/pages/tuiguang/tuiguang.wxss deleted file mode 100644 index 08b506b..0000000 --- a/pages/tuiguang/tuiguang.wxss +++ /dev/null @@ -1,176 +0,0 @@ -/**index.wxss**/ - -page { - background-color: #FF4C00; - height: 100%; -} - -.titletext { - width:100%; - margin-top: 100rpx; - font-size: 45rpx; - -} -.title-text{ - padding: 30rpx 0 25rpx 80rpx; - font-size: 45rpx; - font-weight:bold -} -.goods-list{ - width:701rpx; - height: 880rpx; - background-color: #fff; - border-radius: 15px; - margin-left: 25rpx; -} -.goods-list .list-title{ - font-size: 28rpx; - color: #000; - padding: 30rpx 0 0rpx 80rpx; -} - - - -.goods-list .mima{ - - font-size: 28rpx; - color: #000; - padding: 0rpx 0 0rpx 80rpx; -} -.goods-list .erro{ - font-size: 28rpx; - color: rgb(230, 74, 74); - padding: 10rpx 0 10rpx 80rpx; -} - .input-content{ - font-size: 28rpx; - color: #000; - padding: 10rpx 0 0rpx 0rpx; -} - - - -.peisong-way{ - width: 100%; - background-color: #fff; -} - -.peisong-way .row-box{ - margin-left: 80rpx; - margin-inline-end: 80rpx; - display: flex; - justify-content: space-between; - align-items: center; - box-sizing: border-box; - border-bottom: 1rpx solid #eee; -} - - -.copyright { - width: 100%; - font-size: 28rpx; - color: #B2B2B2; - position: fixed; - bottom: 0; - left: 0; - right: 0; - padding: 30rpx 0 50rpx 0rpx; - text-align: center; -} -.copyrightt { - width: 100%; - font-size: 28rpx; - color: #999; - position: fixed; - left: 0; - right: 0; - padding: 30rpx 0 25rpx 0rpx; - text-align: center; - width: 485rpx; - background: rgb(240, 102, 102); - display: flex; -flex-direction: row; -justify-content: center; - -} -.zc-text{ - color: #999; - font-size: 28rpx; - margin-right: 80rpx; - padding: 30rpx 0 25rpx 0rpx; -} -.wj-text{ - color: #999; - margin-left: 80rpx; - font-size: 28rpx; -} - -.confirm-btn { - font-size: 10pt; - line-height: 85rpx; - width: 485rpx; - height: 85rpx; - background: rgb(240, 102, 102); - color: #fff; - text-align: center; - border-radius: 100rpx; - -} - -.bd { - position: relative; - flex: 1; - display: flex; - flex-direction: column; - align-items: stretch; - animation: bd-rise 2s cubic-bezier(0.23,1,0.32,1) .75s forwards; - opacity: 0; -} - -.sdsdf{ - - display: flex; - width: 0rpx; - height: 56rpx; - background-color: white; - -} - -.yaotext{ - font-size: 34rpx; - color: #3E3E3E; - font-weight: bold; - display: flex; - position: relative; - justify-content: center; - padding-top: 50rpx; - -} -.row-wrap{ - width: 100%; - height: 100rpx; - line-height: 88rpx; - margin-left: 0rpx; - border-bottom: 1rpx solid #eee; - display: flex; - font-size: 28rpx; - /*justify-content: space-between;*/ -} - -.row-wrap .label{ - width: 200rpx; - color: #000; - margin-left: 33rpx; -} -.row-wrap .label-right{ - width: 100%; - height: 88rpx; - line-height: 88rpx; - text-align: right; - -} -.row-wrap .label-right input{ - height: 100%; - font-size: 28rpx; - padding-right: 30rpx; -} \ No newline at end of file diff --git a/pages/webpage/webpage.js b/pages/webpage/webpage.js new file mode 100644 index 0000000..f207fdd --- /dev/null +++ b/pages/webpage/webpage.js @@ -0,0 +1,15 @@ +// pages/webview/index.js +Page({ + data: { + url: "" + }, + onLoad(options) { + + console.log("列表条目的index==" + options.url) + if(options.url){ + this.setData({ + url: decodeURIComponent(options.url) // 如果url后面还有参数需要转码一下否则会丢失 + }) + } + } +}) diff --git a/pages/webpage/webpage.json b/pages/webpage/webpage.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/webpage/webpage.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/webpage/webpage.wxml b/pages/webpage/webpage.wxml new file mode 100644 index 0000000..89e85a1 --- /dev/null +++ b/pages/webpage/webpage.wxml @@ -0,0 +1,2 @@ + + diff --git a/pages/webpage/webpage.wxss b/pages/webpage/webpage.wxss new file mode 100644 index 0000000..fbcaffe --- /dev/null +++ b/pages/webpage/webpage.wxss @@ -0,0 +1 @@ +/* pages/webpage/webpage.wxss */ \ No newline at end of file