diff --git a/app.json b/app.json
index 0dafd48..7cfff98 100644
--- a/app.json
+++ b/app.json
@@ -4,18 +4,12 @@
"pages/peihu/peihu",
"pages/tuiguang/extensionInfor",
"pages/tuiguang/tuiguang",
- "pages/institutions/institutions",
- "pages/cardBag/cardBag",
"pages/my/my",
- "pages/login/login",
"pages/order/order",
"pages/order/re_orderdetail",
"pages/orderdetail/orderdetail",
"pages/reforderdetail/reforderdetail",
"pages/mechanism/mechanism",
- "pages/activity/activity",
- "pages/myshoucang/myshoucang_index",
- "pages/myshoucang/myorderdetail",
"pages/wodeqianbao/qianbao",
"pages/refund/refund",
"pages/peizhen/peizhen",
diff --git a/pages/activity/activity.js b/pages/activity/activity.js
deleted file mode 100644
index 6047aa4..0000000
--- a/pages/activity/activity.js
+++ /dev/null
@@ -1,158 +0,0 @@
-//获取应用实例
-var app = getApp();
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- order_list:[],
- navHeight: '',
- menuButtonInfo: {},
- searchMarginTop: 0, // 搜索框上边距
- searchWidth: 0, // 搜索框宽度
- searchHeight: 0, // 搜索框高度
- style_id:'',
- search:''
- },
- /**
- * 监听搜索内容
- */
- changeSearch: function(e) {
- let that = this;
- var inputSearch = e.detail.value;
- that.setData({
- search: inputSearch
- })
- app.console(inputSearch+"================="+'22dddddddddddddddddddddd2')
- this.getGoodsList();
- },
- back(){
- wx.navigateBack()
- },
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
- app.console('sssssss'+"================="+options.id),
- this.setData({
- style_id:options.id
-
- });
- this.getGoodsList();
- this.setData({
- menuButtonInfo: wx.getMenuButtonBoundingClientRect()
- })
- console.log(this.data.menuButtonInfo)
- const { top, width, height, right } = this.data.menuButtonInfo
- wx.getSystemInfo({
- success: (res) => {
- const { statusBarHeight } = res
- const margin = top - statusBarHeight
- this.setData({
- navHeight: (height + statusBarHeight + (margin * 2) + 15),
- searchMarginTop: statusBarHeight + margin, // 状态栏 + 胶囊按钮边距
- searchHeight: height, // 与胶囊按钮同高
- searchWidth: right - width // 胶囊按钮右边坐标 - 胶囊按钮宽度 = 按钮左边可使用宽度
- })
- },
- })
-
-
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- },
- // 跳转详情
- activity(e){
-
- if (e.currentTarget.dataset.id != 0) {
- console.log("你选择的课程id是"+e.currentTarget.dataset.id);
- wx.navigateTo({
- url: "/shopping/pages/goddess/goddess?id=" + e.currentTarget.dataset.id,
- });
- }
-
- },
- //商品列表
- getGoodsList: function () {
- var that = this;
- wx.request({
- url: app.buildUrl("/app/Goddesswechat/getGoodsList"),
- header: app.getRequestHeader(),
- method:'POST',
- data: {
- version_number: this.data.version_number,
- uid:wx.getStorageSync('uid'),
- token:wx.getStorageSync('token'),
- page:'1',
- page_size:10,
- city:'',
- style_id:this.data.style_id,
- mechanism_id:'',
- serach_name:this.data.search,
- px_type:'',
- lng:'',
- lat:''
- },
- success: function (res) {
- var resp = res.data;
- console.log(resp+"=================dddddddddddddddddddddddddddddddddddddddddddd")
- console.log(resp.erro+"=================dddddddddddddddddddddddddddddddddddddddddddd")
- if(resp.erro==0){
- that.setData({
- order_list:resp.lists
-
- });
- }
- }
- });
- },
-
-})
\ No newline at end of file
diff --git a/pages/activity/activity.json b/pages/activity/activity.json
deleted file mode 100644
index 965b8e8..0000000
--- a/pages/activity/activity.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "usingComponents": {},
- "navigationStyle": "custom"
-}
\ No newline at end of file
diff --git a/pages/activity/activity.wxml b/pages/activity/activity.wxml
deleted file mode 100644
index 230cde5..0000000
--- a/pages/activity/activity.wxml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.goods_name}}
-
-
-
-
- {{item.mechanism_name}}
-
-
- ¥{{item.price}}
- ¥{{item.original_price}}
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/activity/activity.wxss b/pages/activity/activity.wxss
deleted file mode 100644
index 0aa9c9f..0000000
--- a/pages/activity/activity.wxss
+++ /dev/null
@@ -1,128 +0,0 @@
-/* pages/activity/activity.wxss */
-.Group {
- height: 270rpx;
- display: flex;
- /* border-bottom: 1px solid #999999; */
- }
-
- .Group-image {
- width: 230rpx;
- height: 230rpx;
- margin: 19rpx 28rpx 19rpx 31rpx;
- }
-
- .Group-image image {
- width: 100%;
- height: 100%;
- }
-
- .content {
- /* padding: 20rpx 35rpx; */
- width: 400rpx;
- height: 201rpx;
- margin-top: 28rpx;
- }
-
- .content .title1 {
- font-size: 30rpx;
- font-weight: 700;
- }
-
- .content .title2 {
- font-size: 26rpx;
- height: 37rpx;
- line-height: 37rpx;
- display: flex;
- color: #B4B4B4;
- margin: 11rpx 0 18rpx 0;
- }
-
- .content .title2 .house {
- width: 28rpx;
- height: 28rpx;
- margin-right: 7rpx;
- margin-top: 5rpx;
- }
-
- .content .title2 .house image {
- width: 100%;
- height: 100%;
- }
-
- .content .Price {
- display: flex;
- }
-
- .content .Price .Price1 {
- font-size: 34rpx;
- color: #FF4A4A;
- line-height: 42rpx;
- margin-right: 17rpx;
- }
-
- .content .Price .Price2 {
- font-size: 24rpx;
- color: #CBCBCB;
- line-height: 41rpx;
- margin-right: 23rpx;
- text-decoration:line-through;
- }
-
- .content .Price .Price3 {
- width: 51rpx;
- height: 21rpx;
- font-size: 15rpx;
- color: #E75D4D;
- border: 1px solid #E75D4D;
- border-radius: 4rpx;
- text-align: center;
- line-height: 18rpx;
- margin-top: 10rpx;
- }
-
- .order-list{
- width: 100%;
- }
-
-
-
-
- /* _______________________________________ */
- view {
- box-sizing: border-box;
- overflow: hidden;
- }
- .custom-bar {
- /* background-color: #aaa; */
- position: fixed;
- left: 0;
- top: 0;
- width: 100%;
- }
- .custom-bar__wrapper {
- padding: 0 10rpx;
- display: flex;
- justify-content: center;
- align-items: center;
- }
- .search-group {
- width: 100%;
- height: 100%;
- display: flex;
- justify-content: flex-start;
- align-items: center;
- border-radius: 60rpx;
- /* padding: 0 10rpx; */
- padding-left: 25rpx;
- background: #F5F5F5;
- }
- .search-group > input {
- font-size: 25rpx;
- width: 800rpx;
- }
- .search-group > image {
- height: 32rpx;
- width: 32rpx;
- margin-right: 20rpx
- }
-
\ No newline at end of file
diff --git a/pages/appointmentDetails/appointmentDetails.js b/pages/appointmentDetails/appointmentDetails.js
deleted file mode 100644
index adbb1e7..0000000
--- a/pages/appointmentDetails/appointmentDetails.js
+++ /dev/null
@@ -1,201 +0,0 @@
-var dateTimePicker = require('../../utils/dateTimePicker.js');
-const uilt = require('../../utils/util.js');
-var Token = require('../../utils/util.js');
-const app = getApp()
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- dateTimeArray1: null,
- dateTime1: null,
- fromBox:false,
- infor:{},
- store:[],
- store_id:'',
- appointment_time:'',
- name:'',
- phone:wx.getStorageSync('phone'),
- id:''//优惠券id
- },
- yuyue(e){
- console.log(e.currentTarget.dataset)
- this.setData({
- fromBox:true,
- store_id:e.currentTarget.dataset.id
- })
- },
- mengcheng(){
- this.setData({
- fromBox:false
- })
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
- // 获取完整的年月日 时分秒,以及默认显示的数组
- var obj1 = dateTimePicker.dateTimePicker(this.data.startYear, this.data.endYear);
- // 精确到分的处理,将数组的秒去掉
- var lastArray = obj1.dateTimeArray.pop();
- var lastTime = obj1.dateTime.pop();
- console.log(options)
- this.setData({
- id:options.id,
- dateTimeArray1: obj1.dateTimeArray,
- dateTime1: obj1.dateTime
- })
- this.getCouponDetail(options.id)
- },
- changeDateTime1(e) {
- this.setData({ dateTime1: e.detail.value });
- },
-
- changeDateTimeColumn1(e) {
- var arr = this.data.dateTime1, dateArr = this.data.dateTimeArray1;
- arr[e.detail.column] = e.detail.value;
- dateArr[2] = dateTimePicker.getMonthDay(dateArr[0][arr[0]], dateArr[1][arr[1]]);
- this.setData({
- dateTimeArray1: dateArr
- });
- console.log(this.data.dateTimeArray1)
- },
- nameChang(e){
- this.setData({
- name: e.detail.value
- })
-
- },
- phoneChang(e){
- this.setData({
- phone: e.detail.value
- })
- },
- // 点击预约提交信息
- appointment(){
- var that=this;
- var appointment_time;
- var appointment_time=that.data.dateTimeArray1[0][that.data.dateTime1[0]]+'-'+that.data.dateTimeArray1[1][that.data.dateTime1[1]]+"-"+that.data.dateTimeArray1[2][that.data.dateTime1[2]]+' '+that.data.dateTimeArray1[3][that.data.dateTime1[3]]+':'+that.data.dateTimeArray1[4][that.data.dateTime1[4]];
- console.log(that.data.name)
- wx.request({
- url: app.globalData.url + '/device/CouponWechat/submitAppointment',
- data: {
- uid:wx.getStorageSync('uid'),
- token:wx.getStorageSync('token'),
- version_number:app.globalData.version_number,
- id:that.data.id,
- store_id:that.data.store_id,
- appointment_time:appointment_time,
- name:that.data.name,
- phone:that.data.phone
- },
- method: 'POST',
- header: { 'content-type': 'application/x-www-form-urlencoded' },
- success(res) {
- console.log(res)
-
- if(res.data.result.erro=='0'){
- that.setData({
- fromBox:false
- })
- wx.showToast({
- title: '预约成功',
- icon: 'success',
- duration: 1000,
- success(){
- wx.switchTab({
- url: '../cardBag/cardBag.wxml'
- })
- }
- })
-
- }else{
- Token.token()
- that.getCouponDetail(that.data.id)
- }
- }
- })
- },
- // 获取优惠券详情
- getCouponDetail(id){
- var that=this;
- wx.request({
- url: app.globalData.url + '/app/Goddesswechat/selectCouponDetail',
- data: {
- uid:wx.getStorageSync('uid'),
- token:wx.getStorageSync('token'),
- version_number:app.globalData.version_number,
- id:id
- },
- method: 'POST',
- header: { 'content-type': 'application/x-www-form-urlencoded' },
- success(res) {
- console.log(res)
- if(res.data.infor.full_minus){
- res.data.infor.full=res.data.infor.full_minus.split("-")[0];
- res.data.infor.minus=res.data.infor.full_minus.split("-")[1];
- }
- if(res.data.erro=='0'){
- that.setData({
- infor:res.data.infor,
- store:res.data.store
- })
- }else{
- Token.token()
- that.getCouponDetail(that.data.id)
- }
- }
- })
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- }
-})
\ No newline at end of file
diff --git a/pages/appointmentDetails/appointmentDetails.json b/pages/appointmentDetails/appointmentDetails.json
deleted file mode 100644
index 08184b1..0000000
--- a/pages/appointmentDetails/appointmentDetails.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "usingComponents": {},
-
- "backgroundTextStyle":"light",
- "navigationBarBackgroundColor": "#fff",
- "navigationBarTitleText": "详情",
- "navigationBarTextStyle":"black"
-
-}
\ No newline at end of file
diff --git a/pages/appointmentDetails/appointmentDetails.wxml b/pages/appointmentDetails/appointmentDetails.wxml
deleted file mode 100644
index cd8e757..0000000
--- a/pages/appointmentDetails/appointmentDetails.wxml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
- ¥
- {{infor.minus}}
- {{infor.denomination}}
-
- 体验券
- 满减券
- 兑换券
-
- 满{{infor.full}}可用
- {{infor.coupon_name}}
- 有效期:{{infor.expiration_date}}
-
-
-
-
-
- 预约信息
-
- 姓名
- {{infor.name}}
-
-
- 联系方式
- {{infor.phone}}
-
-
- 预约时间
- {{infor.appointment_time}}
-
-
- 适用门店
- 预约门店
-
-
- {{item.store_name}}
- {{item.contact}}
- {{item.address}} 立即预约
-
-
-
-
- 注意事项
- 1.抵扣券、折扣券与抵用金均不可兑换为现金。
- 2.每张抵用券在同一活动中只可使用一次。
- 3.新人礼包每个用户只能领取一次。
- 4.老用户推荐成功后可获得活动邀请券,新用户也可邀请好友获得此券。
-
-
-
-
-
- 请输入您的信息
-
-
-
-
- {{dateTimeArray1[0][dateTime1[0]]}}-{{dateTimeArray1[1][dateTime1[1]]}}-{{dateTimeArray1[2][dateTime1[2]]}} {{dateTimeArray1[3][dateTime1[3]]}}:{{dateTimeArray1[4][dateTime1[4]]}}
-
-
-
-
-
-
-
-
-
-
- 立即预约
-
\ No newline at end of file
diff --git a/pages/appointmentDetails/appointmentDetails.wxss b/pages/appointmentDetails/appointmentDetails.wxss
deleted file mode 100644
index 68010ba..0000000
--- a/pages/appointmentDetails/appointmentDetails.wxss
+++ /dev/null
@@ -1,315 +0,0 @@
-/* pages/appointmentDetails/appointmentDetails.wxss */
-@import "../../component/picker/picker.wxss";
-
-page {
- background-color: #E75D4D;
-}
-
-.zysx {
- margin-left: 24rpx;
- padding-bottom: 34rpx;
-}
-
-.app {
- margin-top: 16rpx;
- margin-left: 24rpx;
- width: 702rpx;
- background-color: #ffffff;
- margin-bottom: 16rpx;
- border-radius: 5rpx;
-}
-
-.title {
- height: 322rpx;
- border-bottom: 1rpx dashed #9E9E9E;
-}
-
-.yuan-left {
- width: 50rpx;
- height: 50rpx;
- border-radius: 50%;
- background-color: #E75D4D;
- position: absolute;
- top: 315rpx;
- left: 0rpx;
-}
-
-.yuan-right {
- width: 50rpx;
- height: 50rpx;
- border-radius: 50%;
- background-color: #E75D4D;
- position: absolute;
- top: 315rpx;
- right: 0rpx;
-}
-
-.details-list {
- /* height: 146rpx; */
- border-bottom: 1px solid #E1E1E1;
- padding-left: 24rpx;
-}
-
-.yy {
- float: right;
- margin-right: 32rpx;
- font-size: 22rpx;
- color: #E75D4D;
- margin-left: 34rpx;
-}
-
-.title-box {
- text-align: center;
- padding-top: 85rpx;
-}
-
-.maoney {
- line-height: 24rpx;
- font-size: 48rpx;
- color: #E54F54;
- width: 48rpx;
- height: 67rpx;
- font-size: 48rpx;
- font-family: PingFang SC;
- font-weight: bold;
- line-height: 24px;
- color: #E54F54;
- opacity: 1;
-}
-
-.maoney-nmb {
- line-height: 36rpx;
- font-size: 74rpx;
- color: #E54F54;
- margin-left: 34rpx;
- margin-left: 10rpx;
- width: 118rpx;
- height: 90rpx;
- font-size: 74rpx;
- font-family: DIN;
- font-weight: 400;
- line-height: 36rpx;
- color: #E54F54;
- opacity: 1;
-}
-
-.status {
- line-height: 29rpx;
- font-size: 24rpx;
- color: #E54F54;
- margin-left: 34rpx;
- width: 72rpx;
- height: 33rpx;
- font-size: 24rpx;
- font-family: PingFang SC;
- font-weight: 500;
- line-height: 29rpx;
- color: #E54F54;
- opacity: 1;
-}
-
-.title-details {
- text-align: center;
- padding-top: 39rpx;
- color: #5B5B5B;
- font-size: 24rpx;
- line-height: 29rpx;
- font-size: 24rpx;
- font-family: PingFang SC;
- font-weight: 400;
- line-height: 29rpx;
- color: #5B5B5B;
- opacity: 1;
-}
-
-.title-time {
- text-align: center;
- padding-top: 10rpx;
- color: #A8A8A8;
- font-size: 24rpx;
- line-height: 29px;
- font-size: 24rpx;
- font-family: PingFang SC;
- font-weight: 400;
- line-height: 29rpx;
- color: #A8A8A8;
- opacity: 1;
-}
-
-.details-title {
- padding-top: 30rpx;
- padding-bottom: 18rpx;
- padding-left: 24rpx;
- font-size: 34rpx;
- color: #515151;
- font-size: 34rpx;
- font-family: PingFang SC;
- font-weight: bold;
- line-height: 29rpx;
- color: #515151;
- opacity: 1;
-}
-
-.details {
- margin-bottom: 31rpx;
-}
-
-.details-md {
- padding-top: 7rpx;
- padding-bottom: 8rpx;
- font-size: 28rpx;
- font-family: PingFang SC;
- font-weight: 500;
- line-height: 40rpx;
- color: #333333;
- opacity: 1;
-}
-
-.details-phone {
- padding-bottom: 8rpx;
-
- font-size: 24rpx;
- font-family: PingFang SC;
- font-weight: 400;
- line-height: 33rpx;
- color: #FF6A6A;
- opacity: 1;
-}
-
-.details-dz {
- padding-bottom: 12rpx;
-
- font-size: 24rpx;
- font-family: PingFang SC;
- font-weight: 400;
- line-height: 33rpx;
- color: #B9B9B9;
- opacity: 1;
-}
-
-.zysx-title {
- width: 136rpx;
- height: 48rpx;
- font-size: 34rpx;
- font-family: PingFang SC;
- font-weight: bold;
- line-height: 48rpx;
- color: #515151;
- opacity: 1;
- margin-bottom: 9rpx;
-}
-
-.zysx-text {
- width: 608rpx;
- font-size: 28rpx;
- font-family: PingFang SC;
- font-weight: 500;
- line-height: 54rpx;
- color: #333333;
- opacity: 1;
-}
-
-.details-yy {
- margin-right: 25rpx;
- margin-left: 25rpx;
- padding-top: 51rpx;
- padding-bottom: 33rpx;
- border-bottom: 1px dashed #9E9E9E;
-}
-
-.yy-title {
- width: 136rpx;
- height: 48rpx;
- font-size: 34rpx;
- font-family: PingFang SC;
- font-weight: bold;
- line-height: 29rpx;
- color: #515151;
- opacity: 1;
-}
-
-.yy-details {
- margin-bottom: 40rpx;
-}
-
-.yy-sizestyle {
- font-size: 28rpx;
- font-family: PingFang SC;
- font-weight: 500;
- color: #333333;
- opacity: 1;
-}
-
-.from-box {
- width: 750rpx;
- height: 610rpx;
- background-color: #fff;
- border-radius: 10px 10px 0px 0px;
- position: fixed;
- bottom: 0;
- /* text-align: center; */
- z-index: 101;
-
-}
-
-.from-title {
- margin-top: 28rpx;
- margin-bottom: 25rpx;
- font-size: 34rpx;
- font-family: PingFang SC;
- font-weight: 400;
- line-height: 48rpx;
- color: #2D2D2D;
- opacity: 1;
- text-align: center;
-}
-
-.from-btn {
- width: 504rpx;
- height: 85rpx;
- background-image: url(data:image/png;base64,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);
- background-size: cover;
- text-align: center;
- line-height: 85rpx;
- font-size: 30rpx;
- font-family: Alibaba PuHuiTi;
- font-weight: 400;
- color: #FFFFFF;
- opacity: 1;
- margin: 0 auto;
-
-}
-
-.mengcheng {
- background-color: #000;
- width: 100%;
- height: 100%;
- position: fixed;
- z-index: 100;
- top: 0rpx;
- opacity: 0.4;
-
-}
-
-.yzm {
- background: #F3F3F3;
- width: 186rpx;
- height: 84rpx;
- display: inline-block;
- margin-left: 17rpx;
- line-height: 84rpx;
-font-size: 26rpx;
-font-family: PingFang SC;
-font-weight: 400;
-color: #A7A7A7;
-opacity: 1;
-}
-.piker_n{
- margin-bottom: 200rpx;
- width:530rpx;
- padding-left: 34rpx;
- margin:0 auto;
- background: #F3F3F3;
- height: 84rpx;
- line-height: 84rpx;
-}
\ No newline at end of file
diff --git a/pages/cardBag/cardBag.js b/pages/cardBag/cardBag.js
deleted file mode 100644
index 9bc6d51..0000000
--- a/pages/cardBag/cardBag.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// pages/cardBag/cardBag.js
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
-
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad(options) {
-
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
- }
-})
\ No newline at end of file
diff --git a/pages/cardBag/cardBag.wxml b/pages/cardBag/cardBag.wxml
deleted file mode 100644
index a885d1c..0000000
--- a/pages/cardBag/cardBag.wxml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-pages/cardBag/cardBag.wxml
diff --git a/pages/image copy/Bargain.png b/pages/image copy/Bargain.png
deleted file mode 100644
index ded1d9f..0000000
Binary files a/pages/image copy/Bargain.png and /dev/null differ
diff --git a/pages/image copy/Collage.png b/pages/image copy/Collage.png
deleted file mode 100644
index ed356e7..0000000
Binary files a/pages/image copy/Collage.png and /dev/null differ
diff --git a/pages/image copy/Collection.png b/pages/image copy/Collection.png
deleted file mode 100644
index b263d55..0000000
Binary files a/pages/image copy/Collection.png and /dev/null differ
diff --git a/pages/image copy/Hairdressing.png b/pages/image copy/Hairdressing.png
deleted file mode 100644
index 376731d..0000000
Binary files a/pages/image copy/Hairdressing.png and /dev/null differ
diff --git a/pages/image copy/Micro.png b/pages/image copy/Micro.png
deleted file mode 100644
index 115f823..0000000
Binary files a/pages/image copy/Micro.png and /dev/null differ
diff --git a/pages/image copy/Shaping.png b/pages/image copy/Shaping.png
deleted file mode 100644
index b502736..0000000
Binary files a/pages/image copy/Shaping.png and /dev/null differ
diff --git a/pages/image copy/Skin.png b/pages/image copy/Skin.png
deleted file mode 100644
index 2deb0bf..0000000
Binary files a/pages/image copy/Skin.png and /dev/null differ
diff --git a/pages/image copy/Star.png b/pages/image copy/Star.png
deleted file mode 100644
index 568b559..0000000
Binary files a/pages/image copy/Star.png and /dev/null differ
diff --git a/pages/image copy/White.png b/pages/image copy/White.png
deleted file mode 100644
index 81cb795..0000000
Binary files a/pages/image copy/White.png and /dev/null differ
diff --git a/pages/image copy/address.png b/pages/image copy/address.png
deleted file mode 100644
index 988bc8f..0000000
Binary files a/pages/image copy/address.png and /dev/null differ
diff --git a/pages/image copy/antifading.png b/pages/image copy/antifading.png
deleted file mode 100644
index c79d20d..0000000
Binary files a/pages/image copy/antifading.png and /dev/null differ
diff --git a/pages/image copy/caitiao.png b/pages/image copy/caitiao.png
deleted file mode 100644
index e8f7bf6..0000000
Binary files a/pages/image copy/caitiao.png and /dev/null differ
diff --git a/pages/image copy/cardbag.png b/pages/image copy/cardbag.png
deleted file mode 100644
index 6ff9960..0000000
Binary files a/pages/image copy/cardbag.png and /dev/null differ
diff --git a/pages/image copy/cardbag_a.png b/pages/image copy/cardbag_a.png
deleted file mode 100644
index 6c4c088..0000000
Binary files a/pages/image copy/cardbag_a.png and /dev/null differ
diff --git a/pages/image copy/clock.png b/pages/image copy/clock.png
deleted file mode 100644
index 4301b29..0000000
Binary files a/pages/image copy/clock.png and /dev/null differ
diff --git a/pages/image copy/colleme.png b/pages/image copy/colleme.png
deleted file mode 100644
index a211aed..0000000
Binary files a/pages/image copy/colleme.png and /dev/null differ
diff --git a/pages/image copy/cosmetology.png b/pages/image copy/cosmetology.png
deleted file mode 100644
index 2705b1d..0000000
Binary files a/pages/image copy/cosmetology.png and /dev/null differ
diff --git a/pages/image copy/expired.png b/pages/image copy/expired.png
deleted file mode 100644
index b1d1ea7..0000000
Binary files a/pages/image copy/expired.png and /dev/null differ
diff --git a/pages/image copy/home/home-banner.png b/pages/image copy/home/home-banner.png
deleted file mode 100644
index 118e6bb..0000000
Binary files a/pages/image copy/home/home-banner.png and /dev/null differ
diff --git a/pages/image copy/home/home-head.png b/pages/image copy/home/home-head.png
deleted file mode 100644
index ae79678..0000000
Binary files a/pages/image copy/home/home-head.png and /dev/null differ
diff --git a/pages/image copy/home/代办买药.png b/pages/image copy/home/代办买药.png
deleted file mode 100644
index 429eddf..0000000
Binary files a/pages/image copy/home/代办买药.png and /dev/null differ
diff --git a/pages/image copy/home/出入院办理.png b/pages/image copy/home/出入院办理.png
deleted file mode 100644
index 86e7749..0000000
Binary files a/pages/image copy/home/出入院办理.png and /dev/null differ
diff --git a/pages/image copy/home/取送结果.png b/pages/image copy/home/取送结果.png
deleted file mode 100644
index 3142e74..0000000
Binary files a/pages/image copy/home/取送结果.png and /dev/null differ
diff --git a/pages/image copy/home/就医陪诊-back.png b/pages/image copy/home/就医陪诊-back.png
deleted file mode 100644
index 6e3d789..0000000
Binary files a/pages/image copy/home/就医陪诊-back.png and /dev/null differ
diff --git a/pages/image copy/home/诊前约号.png b/pages/image copy/home/诊前约号.png
deleted file mode 100644
index 701aa3f..0000000
Binary files a/pages/image copy/home/诊前约号.png and /dev/null differ
diff --git a/pages/image copy/home/院内陪护-back.png b/pages/image copy/home/院内陪护-back.png
deleted file mode 100644
index f33298b..0000000
Binary files a/pages/image copy/home/院内陪护-back.png and /dev/null differ
diff --git a/pages/image copy/home_bj.png b/pages/image copy/home_bj.png
deleted file mode 100644
index b2ea3af..0000000
Binary files a/pages/image copy/home_bj.png and /dev/null differ
diff --git a/pages/image copy/image_left.png b/pages/image copy/image_left.png
deleted file mode 100644
index ab15151..0000000
Binary files a/pages/image copy/image_left.png and /dev/null differ
diff --git a/pages/image copy/image_right.png b/pages/image copy/image_right.png
deleted file mode 100644
index b404c80..0000000
Binary files a/pages/image copy/image_right.png and /dev/null differ
diff --git a/pages/image copy/income.png b/pages/image copy/income.png
deleted file mode 100644
index 0a1c73d..0000000
Binary files a/pages/image copy/income.png and /dev/null differ
diff --git a/pages/image copy/income_a.png b/pages/image copy/income_a.png
deleted file mode 100644
index 4c9124f..0000000
Binary files a/pages/image copy/income_a.png and /dev/null differ
diff --git a/pages/image copy/left.png b/pages/image copy/left.png
deleted file mode 100644
index 376179c..0000000
Binary files a/pages/image copy/left.png and /dev/null differ
diff --git a/pages/image copy/manicure.png b/pages/image copy/manicure.png
deleted file mode 100644
index d235a78..0000000
Binary files a/pages/image copy/manicure.png and /dev/null differ
diff --git a/pages/image copy/max.png b/pages/image copy/max.png
deleted file mode 100644
index 83b25a2..0000000
Binary files a/pages/image copy/max.png and /dev/null differ
diff --git a/pages/image copy/max_a.png b/pages/image copy/max_a.png
deleted file mode 100644
index 919ba23..0000000
Binary files a/pages/image copy/max_a.png and /dev/null differ
diff --git a/pages/image copy/money.png b/pages/image copy/money.png
deleted file mode 100644
index 3b1e73f..0000000
Binary files a/pages/image copy/money.png and /dev/null differ
diff --git a/pages/image copy/my.png b/pages/image copy/my.png
deleted file mode 100644
index 76572aa..0000000
Binary files a/pages/image copy/my.png and /dev/null differ
diff --git a/pages/image copy/my_a.png b/pages/image copy/my_a.png
deleted file mode 100644
index 519cf02..0000000
Binary files a/pages/image copy/my_a.png and /dev/null differ
diff --git a/pages/image copy/no_order.png b/pages/image copy/no_order.png
deleted file mode 100644
index 17bd92d..0000000
Binary files a/pages/image copy/no_order.png and /dev/null differ
diff --git a/pages/image copy/notice.png b/pages/image copy/notice.png
deleted file mode 100644
index 390dac6..0000000
Binary files a/pages/image copy/notice.png and /dev/null differ
diff --git a/pages/image copy/null.png b/pages/image copy/null.png
deleted file mode 100644
index 17bd92d..0000000
Binary files a/pages/image copy/null.png and /dev/null differ
diff --git a/pages/image copy/one.png b/pages/image copy/one.png
deleted file mode 100644
index 49c2efb..0000000
Binary files a/pages/image copy/one.png and /dev/null differ
diff --git a/pages/image copy/order.png b/pages/image copy/order.png
deleted file mode 100644
index 74fe6f5..0000000
Binary files a/pages/image copy/order.png and /dev/null differ
diff --git a/pages/image copy/order_a.png b/pages/image copy/order_a.png
deleted file mode 100644
index e72baac..0000000
Binary files a/pages/image copy/order_a.png and /dev/null differ
diff --git a/pages/image copy/phone.png b/pages/image copy/phone.png
deleted file mode 100644
index a14ca83..0000000
Binary files a/pages/image copy/phone.png and /dev/null differ
diff --git a/pages/image copy/pintuan.png b/pages/image copy/pintuan.png
deleted file mode 100644
index 9064418..0000000
Binary files a/pages/image copy/pintuan.png and /dev/null differ
diff --git a/pages/image copy/right.png b/pages/image copy/right.png
deleted file mode 100644
index 3a5a115..0000000
Binary files a/pages/image copy/right.png and /dev/null differ
diff --git a/pages/image copy/right1.png b/pages/image copy/right1.png
deleted file mode 100644
index fd606c6..0000000
Binary files a/pages/image copy/right1.png and /dev/null differ
diff --git a/pages/image copy/save.png b/pages/image copy/save.png
deleted file mode 100644
index 56cc946..0000000
Binary files a/pages/image copy/save.png and /dev/null differ
diff --git a/pages/image copy/service.png b/pages/image copy/service.png
deleted file mode 100644
index 67feddc..0000000
Binary files a/pages/image copy/service.png and /dev/null differ
diff --git a/pages/image copy/service_bg.png b/pages/image copy/service_bg.png
deleted file mode 100644
index 83e62e9..0000000
Binary files a/pages/image copy/service_bg.png and /dev/null differ
diff --git a/pages/image copy/shoucang.png b/pages/image copy/shoucang.png
deleted file mode 100644
index 83575ad..0000000
Binary files a/pages/image copy/shoucang.png and /dev/null differ
diff --git a/pages/image copy/site.png b/pages/image copy/site.png
deleted file mode 100644
index d3926a7..0000000
Binary files a/pages/image copy/site.png and /dev/null differ
diff --git a/pages/image copy/success.png b/pages/image copy/success.png
deleted file mode 100644
index 56a0d6c..0000000
Binary files a/pages/image copy/success.png and /dev/null differ
diff --git a/pages/image copy/tuiguang_bg.jpg b/pages/image copy/tuiguang_bg.jpg
deleted file mode 100644
index d71a5e7..0000000
Binary files a/pages/image copy/tuiguang_bg.jpg and /dev/null differ
diff --git a/pages/image copy/tuiguang_bj.png b/pages/image copy/tuiguang_bj.png
deleted file mode 100644
index 08b68fb..0000000
Binary files a/pages/image copy/tuiguang_bj.png and /dev/null differ
diff --git a/pages/image copy/tuiguang_i.png b/pages/image copy/tuiguang_i.png
deleted file mode 100644
index e6283c2..0000000
Binary files a/pages/image copy/tuiguang_i.png and /dev/null differ
diff --git a/pages/image copy/userimg.png b/pages/image copy/userimg.png
deleted file mode 100644
index 0cbfd55..0000000
Binary files a/pages/image copy/userimg.png and /dev/null differ
diff --git a/pages/image copy/wallet.png b/pages/image copy/wallet.png
deleted file mode 100644
index 0992738..0000000
Binary files a/pages/image copy/wallet.png and /dev/null differ
diff --git a/pages/institutions/institutions.js b/pages/institutions/institutions.js
deleted file mode 100644
index 3bcc9e0..0000000
--- a/pages/institutions/institutions.js
+++ /dev/null
@@ -1,105 +0,0 @@
-//获取应用实例
-const app = getApp()
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- id:''
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
-
- this.setData({
- id:options.id
- })
- this.getMechanismIndex()
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- },
- // 跳转详情
- itemgodetail(e){
- if (e.currentTarget.dataset.id != 0) {
- console.log("你选择的课程id是"+e.currentTarget.dataset.id);
- wx.navigateTo({
- url: "/shopping/pages/goddess/goddess?id=" + e.currentTarget.dataset.id,
- });
- }
- },
- //机构详情
- getMechanismIndex: function () {
- var that = this;
- wx.request({
- url: app.buildUrl("/app/Goddesswechat/getMechanismIndex"),
- header: app.getRequestHeader(),
- method:'POST',
- data: {
- version_number: this.data.version_number,
- uid:wx.getStorageSync('uid'),
- token:wx.getStorageSync('token'),
- id:this.data.id
- },
- success: function (res) {
- var resp = res.data;
- if(resp.erro==0){
- that.setData({
- infor:resp.infor,
- goods:resp.goods,
- activity:resp.activity,
- });
- }
- }
- });
- },
-})
\ No newline at end of file
diff --git a/pages/institutions/institutions.json b/pages/institutions/institutions.json
deleted file mode 100644
index 5353019..0000000
--- a/pages/institutions/institutions.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "usingComponents": {},
- "navigationBarTitleText": "机构主页"
-}
\ No newline at end of file
diff --git a/pages/institutions/institutions.wxml b/pages/institutions/institutions.wxml
deleted file mode 100644
index 9a6e0ed..0000000
--- a/pages/institutions/institutions.wxml
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-
- {{infor.mechanism_name}}
- 认证医院:认证医院机构;正品保证机构
-
- {{infor.score}}
-
-
-
-
-
-
-
- {{infor.address}}
-
-
-
-
-
-
-
-
- 活动专区
-
-
-
-
- {{item.goods_name}}
- ¥{{item.price}}
- 剩余{{item.stock}}件
- 抢
-
-
-
-
-
-
-
- 服务
-
-
-
-
-
-
- {{item.goods_name}}
-
-
- {{item.mechanism_name}}
-
-
- ¥{{item.price}}
-
- 已售{{item.sold}}
-
-
-
-
\ No newline at end of file
diff --git a/pages/institutions/institutions.wxss b/pages/institutions/institutions.wxss
deleted file mode 100644
index 90d8ec9..0000000
--- a/pages/institutions/institutions.wxss
+++ /dev/null
@@ -1,194 +0,0 @@
-/* pages/institutions/institutions.wxss */
-page {
- background: #F5F5F5;
-}
-
-.detail_box {
- padding: 0 24rpx;
- margin-top: 23rpx;
- display: flex;
- font-size: 20rpx;
- font-family: PingFang SC;
- font-weight: 400;
- color: #6A6A6A;
- opacity: 1;
- position: relative;
-
-}
-
-.header_img {
- height: 149rpx;
- width: 149rpx;
- border-radius: 50%;
- position: absolute;
- top: 0;
- right: 49rpx;
-}
-
-.title_map {
- width: 408rpx;
- height: 96rpx;
- font-size: 34rpx;
- font-family: PingFang SC;
- font-weight: bold;
- color: #333333;
- opacity: 1;
- margin-bottom: 23rpx;
- text-overflow: -o-ellipsis-lastline;
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- line-clamp: 2;
- -webkit-box-orient: vertical;
-}
-
-.title {
- width: 189rpx;
- height: 50rpx;
- font-size: 18rpx;
- font-family: PingFang SC;
- font-weight: 500;
- color: #414141;
- opacity: 1;
- text-overflow: -o-ellipsis-lastline;
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- line-clamp: 2;
- -webkit-box-orient: vertical;
-}
-
-.money {
- font-size: 18rpx;
- font-family: PingFang SC;
- font-weight: 500;
- color: #E75D4D;
- opacity: 1;
-}
-
-.conter {
- font-size: 16rpx;
- font-family: PingFang SC;
- font-weight: 400;
- color: #A7A7A7;
- opacity: 1;
-
-}
-.scroll_box{
- background: #fff;margin-top: 8rpx;padding:18rpx 10rpx 26rpx 24rpx;
-}
-
-.qiang {
- line-height: 35rpx;
- width: 39rpx;
- position: absolute;
- text-align: center;
- bottom: 10rpx;
- right: 10rpx;
- background: #FF576E;
- border-radius: 8rpx;
- font-size: 20rpx;
- color:#fff;
-}
-.recommended_box{
- padding: 16rpx 24rpx 0rpx;
- background: linear-gradient(180deg, #FFFFFF 0%, #EFEFEF 100%);
- margin: 8rpx 0;
-
-}
-.fuwu{
- line-height: 41rpx;
- margin-bottom: 18rpx;
- display: flex;
- justify-content: space-between;
-}
-.fuwu text:nth-child(1){
- font-size:28rpx;
- color: #222;
-}
-.fuwu text:nth-child(2){
- font-size: 26rpx;
-line-height: 31rpx;
-color: #AEAEAE;
-}
-.title1{
- width: 329rpx;
-height: 56rx;
-font-size: 20rpx;
-font-family: PingFang SC;
-font-weight: 500;
-color: #414141;
-opacity: 1;
- text-overflow: -o-ellipsis-lastline;
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- line-clamp: 2;
- -webkit-box-orient: vertical;
-}
-.dianpu{
-font-size: 20rpx;
-font-family: PingFang SC;
-font-weight: 400;
-line-height: 28rpx;
-color: #B4B4B4;
-opacity: 1;
-}
-.title1 {
- width: 329rpx;
- height: 56rx;
- font-size: 20rpx;
- font-family: PingFang SC;
- font-weight: 500;
- color: #414141;
- opacity: 1;
- text-overflow: -o-ellipsis-lastline;
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- line-clamp: 2;
- -webkit-box-orient: vertical;
-}
-.dianpu {
- font-size: 20rpx;
- font-family: PingFang SC;
- font-weight: 400;
- line-height: 18rpx;
- color: #B4B4B4;
- opacity: 1;
- margin-left: 6rpx;
-}
-
-.price {
- display: flex;
- margin-top: 8rpx;
-}
-.price view:nth-child(1) {
- line-height: 44rpx;
- font-size: 20rpx;
- font-weight: 700;
- color: #E75D4D;
-}
-
-.price view:nth-child(2) {
- width: 51rpx;
- height: 21rpx;
- border: 1px solid #E75D4D;
- border-radius: 4rpx;
- font-size: 15rpx;
- font-weight: 400;
- color: #e75d4d;
- text-align: center;
- margin: 11rpx ;
-}
-.price view:nth-child(3){
- font-size: 20rpx;
- line-height: 44rpx;
- font-weight: 400;
- color: #B4B4B4;
- margin-left: 121rpx;
-}
\ No newline at end of file
diff --git a/pages/login/login.js b/pages/login/login.js
deleted file mode 100644
index b3f0a1d..0000000
--- a/pages/login/login.js
+++ /dev/null
@@ -1,203 +0,0 @@
-const app = getApp()
-
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- userInfo:{},
- phoneFlag:true,
- uidFlag:false
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
- this.getLogin()
- // console.log(this.userInfo)
- },
- // getUserInfo(e) {
- // var _this=this;
- // wx.getUserInfo({
- // desc: '展示用户信息', // 声明获取用户个人信息后的用途,后续会展示在弹窗中,请谨慎填写
- // success: (res) => {
- // console.log(res)
- // this.setData({
- // userInfo: res.userInfo,
- // hasUserInfo: true
- // })
- // if(res.encryptedData&&res.iv){
- // _this.wechatLogin(res.encryptedData,res.iv)
- // }
- // }
- // })
- // },
- // 登录
- getLogin() {
- var that=this;
- wx.login({
- success: res => {
- console.log(res)
- app.globalData.code = res.code
- }
- })
- },
- // 获取电话号码
- getPhoneNumber (e) {
- var _this=this;
- wx.request({
- url: app.globalData.url + '/device/CouponWechat/login',
- 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) {
- console.log(1111111)
- console.log(res)
- if (res.data.result.erro == 0) {
- // wx.setStorageSync('phonenum', true);
- app.globalData.phone = res.data.result.phone;
- wx.setStorageSync('phone', res.data.result.phone);
- app.globalData.uid = res.data.result.uid;
- wx.setStorageSync('uid', res.data.result.uid);
- // wx.setStorageSync('uidFlag', true);
- wx.switchTab({
- url: '/pages/index/index'
- })
- // _this.wechatLogin()
- // _this.setData({
- // uidFlag:true,
- // phoneFlag:false
- // })
- wx.showToast({
- title: res.data.msg,
- icon: 'success',
- duration: 2000
- })
- }else{
- wx.showToast({
- title: res.data.msg,
- icon: 'error',
- duration: 2000
- })
- }
- }
- })
- },
- // 用户信息登录小程序
- // wechatLogin(encryptedData,iv){
- // var _this=this;
- // wx.request({
- // url: app.globalData.url + '/device/CouponWechat/login',
- // data: {
- // encryptedData:encryptedData,
- // iv: iv,
- // phone: app.globalData.phone,
- // sessionKey: app.globalData.sessionKey
- // },
- // method: 'POST',
- // header: { 'content-type': 'application/x-www-form-urlencoded' },
- // success(res) {
- // console.log(res)
- // if(res.data.erro==0){
- // app.globalData.token=res.data.token;
- // app.globalData.uid=res.data.uid;
- // wx.setStorageSync('token', res.data.token);
- // wx.setStorageSync('uid', res.data.uid);
- // _this.getToken()
- // }else{
- // wx.showToast({
- // title: res.data.msg,
- // icon: 'none',
- // duration: 2000
- // })
- // }
-
- // }
- // })
- // },
- // 获取token
- getToken(){
- var that=this;
- wx.request({
- url: app.globalData.url + '/device/CouponWechat/getToken',
- data: {
- uid:wx.getStorageSync('uid'),
- phone: app.globalData.phone
- },
- method: 'POST',
- header: { 'content-type': 'application/x-www-form-urlencoded' },
- success:(res)=>{
- console.log(res)
- if(res.data.erro=='0'){
- app.globalData.token=res.data.token;
- wx.setStorageSync('token', res.data.token);
-
- wx.switchTab({
- url: '/pages/cardBag/cardBag'
- })
- }else{
- wx.showToast({
- title: res.data.msg,
- icon: 'none',
- duration: 2000
- })
- }
- }
- })
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- }
-})
\ No newline at end of file
diff --git a/pages/login/login.json b/pages/login/login.json
deleted file mode 100644
index 40363f8..0000000
--- a/pages/login/login.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "usingComponents": {},
- "navigationBarTitleText": "登录"
-
-}
\ No newline at end of file
diff --git a/pages/login/login.wxml b/pages/login/login.wxml
deleted file mode 100644
index e871fa1..0000000
--- a/pages/login/login.wxml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/pages/login/login.wxss b/pages/login/login.wxss
deleted file mode 100644
index 12c8d21..0000000
--- a/pages/login/login.wxss
+++ /dev/null
@@ -1,7 +0,0 @@
-.phone{
- margin: 40rpx;
-}
-.uid{
- margin: 40rpx;
-
-}
\ No newline at end of file
diff --git a/pages/switchcity/switchcity.js b/pages/switchcity/switchcity.js
deleted file mode 100644
index 5f855dd..0000000
--- a/pages/switchcity/switchcity.js
+++ /dev/null
@@ -1,97 +0,0 @@
-var city = require('../../utils/city.js');
-var app = getApp()
-Page({
- data: {
- searchLetter: [],
- showLetter: "",
- winHeight: 0,
- // tHeight: 0,
- // bHeight: 0,
- cityList: [],
- isShowLetter: false,
- scrollTop: 0,//置顶高度
- scrollTopId: '',//置顶id
- city: "上海市",
- hotcityList: [{ cityCode: 110000, city: '北京市' }, { cityCode: 310000, city: '上海市' }, { cityCode: 440100, city: '广州市' }, { cityCode: 440300, city: '深圳市' }, { cityCode: 330100, city: '杭州市' }, { cityCode: 320100, city: '南京市' }, { cityCode: 420100, city: '武汉市' }, { cityCode: 410100, city: '郑州市' }, { cityCode: 120000, city: '天津市' }, { cityCode: 610100, city: '西安市' }, { cityCode: 510100, city: '成都市' }, { cityCode: 500000, city: '重庆市' }]
- },
- onLoad: function () {
- // 生命周期函数--监听页面加载
- var searchLetter = city.searchLetter;
- var cityList = city.cityList();
- var sysInfo = wx.getSystemInfoSync();
- var winHeight = sysInfo.windowHeight;
- var itemH = winHeight / searchLetter.length;
- var tempObj = [];
- for (var i = 0; i < searchLetter.length; i++) {
- var temp = {};
- temp.name = searchLetter[i];
- temp.tHeight = i * itemH;
- temp.bHeight = (i + 1) * itemH;
- tempObj.push(temp)
- }
- this.setData({
- winHeight: winHeight,
- itemH: itemH,
- searchLetter: tempObj,
- cityList: cityList
- })
-
- },
- onReady: function () {
- // 生命周期函数--监听页面初次渲染完成
-
- },
- onShow: function () {
- // 生命周期函数--监听页面显示
-
- },
- onHide: function () {
- // 生命周期函数--监听页面隐藏
-
- },
- onUnload: function () {
- // 生命周期函数--监听页面卸载
-
- },
- onPullDownRefresh: function () {
- // 页面相关事件处理函数--监听用户下拉动作
-
- },
- onReachBottom: function () {
- // 页面上拉触底事件的处理函数
-
- },
- clickLetter: function (e) {
- console.log(e.currentTarget.dataset.letter)
- var showLetter = e.currentTarget.dataset.letter;
- this.setData({
- showLetter: showLetter,
- isShowLetter: true,
- scrollTopId: showLetter,
- })
- var that = this;
- setTimeout(function () {
- that.setData({
- isShowLetter: false
- })
- }, 1000)
- },
- //选择城市
- bindCity: function (e) {
- console.log("bindCity")
- this.setData({ city: e.currentTarget.dataset.city })
- },
- //选择热门城市
- bindHotCity: function (e) {
- console.log("bindHotCity")
- this.setData({
- city: e.currentTarget.dataset.city
- })
- },
- //点击热门城市回到顶部
- hotCity: function () {
- this.setData({
- scrollTop: 0,
- })
- }
-})
\ No newline at end of file