diff --git a/application/.htaccess b/application/.htaccess
deleted file mode 100644
index 3418e55a..00000000
--- a/application/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-deny from all
\ No newline at end of file
diff --git a/application/routine/view/crmebN/app.json b/application/routine/view/crmebN/app.json
index 33c763c0..32513e56 100644
--- a/application/routine/view/crmebN/app.json
+++ b/application/routine/view/crmebN/app.json
@@ -18,7 +18,6 @@
"pages/spread/spread",
"pages/promotion-order/promotion-order",
"pages/coupon/coupon",
- "pages/cut-list/cut-list",
"pages/news-list/news-list",
"pages/product-con/index",
"pages/product-pinke/index",
@@ -34,7 +33,6 @@
"pages/integral-con/integral-con",
"pages/orders-con/orders-con",
"pages/order-confirm/order-confirm",
- "pages/pink-list/index",
"pages/productSort/productSort",
"pages/address/address",
"pages/feree/feree",
diff --git a/application/routine/view/crmebN/pages/cut-list/cut-list.js b/application/routine/view/crmebN/pages/cut-list/cut-list.js
deleted file mode 100644
index 16b0d0de..00000000
--- a/application/routine/view/crmebN/pages/cut-list/cut-list.js
+++ /dev/null
@@ -1,59 +0,0 @@
-var app = getApp();
-// pages/cut-list/cut-list.js
-Page({
-
- data: {
- url: app.globalData.urlImages,
- cutList:[],
- titleImage:'',
- title: [],
- lovely:'',
- indicatorDots: true,//是否显示面板指示点;
- autoplay: true,//是否自动播放;
- interval: 3000,//动画间隔的时间;
- duration: 500,//动画播放的时长;
- vertical: true,
- circular: true
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
- app.setBarColor();
- app.setUserInfo();
- this.cut_list();
-
- },
-cut_list:function(){
- var that = this;
- wx.request({
- url: app.globalData.url + '/routine/auth_api/get_bargain_list?uid=' + app.globalData.uid,
- method: 'POST',
- success: function (res) {
- if (res.data.code == 200) {
- that.setData({
- cutList: res.data.data.bargain,
- titleImage: res.data.data.banner,
- lovely: res.data.data.lovely,
- title: res.data.data.bargainUser
- })
- }else{
- that.setData({
- cutList: []
- })
- }
- }
- })
-},
- cut:function(e){
- var id = e.currentTarget.dataset.id;
- wx.navigateTo({
- url: '../../pages/cut-one/cut-one?id='+id,
- success: function (res) { },
- fail: function (res) { },
- complete: function (res) { },
- })
- }
-
-})
\ No newline at end of file
diff --git a/application/routine/view/crmebN/pages/cut-list/cut-list.json b/application/routine/view/crmebN/pages/cut-list/cut-list.json
deleted file mode 100644
index 824b4b3e..00000000
--- a/application/routine/view/crmebN/pages/cut-list/cut-list.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "navigationBarTitleText": "砍价列表"
-}
\ No newline at end of file
diff --git a/application/routine/view/crmebN/pages/cut-list/cut-list.wxml b/application/routine/view/crmebN/pages/cut-list/cut-list.wxml
deleted file mode 100644
index 631eeb06..00000000
--- a/application/routine/view/crmebN/pages/cut-list/cut-list.wxml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- {{item.info}}
-
-
-
-
-
-
-
-
- {{item.title}}
-
- 最低
- ￥{{item.min_price}}
- 原价￥{{item.price}}
-
-
-
-
- {{item.userInfoCount}}人正在参加
- 去砍价
-
-
-
-
-
-
-
-
-
-
-
diff --git a/application/routine/view/crmebN/pages/cut-list/cut-list.wxss b/application/routine/view/crmebN/pages/cut-list/cut-list.wxss
deleted file mode 100644
index b1f78144..00000000
--- a/application/routine/view/crmebN/pages/cut-list/cut-list.wxss
+++ /dev/null
@@ -1,18 +0,0 @@
-.catlist image{width:100%;height:300rpx;}
-.catlist-nav{height:72rpx;padding:0 20rpx;justify-content:space-between;align-items:center;background-color:#fff;}
-.catlist-nav image{width:52rpx;height:52rpx;border-radius:50%;border:4rpx solid #fff;}
-.catlist-list{width:633rpx;font-size:26rpx;color:#545454;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;height:72rpx;
-line-height:72rpx;}
-.catlist-li{height:576rpx;border-radius:12rpx;background-color:#fff;width:345rpx;margin-top:20rpx;}
-.li-pic{width:100%;height:345rpx;margin:0 auto;border-radius:12rpx 12rpx 0 0;}
-.catlist-text{color:#262626;font-size:28rpx;padding:0 20rpx;margin:15rpx 0 10rpx 0;line-height:1.5;}
-.pic-list{padding:10rpx 20rpx;align-items:center;justify-content:space-between;}
-.pic-list .pic-con{margin-left:12rpx;position:relative;}
-.pic-list text{font-size:26rpx;color:#666666;}
-.pic-list image{width:52rpx;height:52rpx;border-radius:50%;border:4rpx solid #fff;margin-left:-12rpx;}
-.catlist-li .text-color{font-size:24rpx;color:#FF3D3D;padding:0 20rpx;justify-content:space-between;}
-.catlist-li .color-num{font-size:32rpx;}
-.none-num{color:#AAAAAA;text-decoration-line:line-through;}
-.color-but{width:105rpx;height:55rpx;line-height:55rpx;text-align:center;background-color:#FF3D3D;border-radius:50rpx;color:#fff;font-size:24rpx;box-shadow:2rpx 3rpx 10rpx #FF3D3D;box-shadow:-1rpx 0rpx 5rpx #FF3D3D;}
-.pic-con .pic-dai{width:52rpx;height:52rpx;color:#fff;border-radius:50%;background-color:#DDDDDD;text-align:center;line-height:22rpx;font-size:50rpx;display:inline-block;position:absolute;top:0;border:4rpx solid #fff;right:-47rpx;}
-.catlist-ul{margin-bottom:20rpx;padding:0 20rpx;justify-content:space-between;flex-wrap:wrap;}
diff --git a/application/routine/view/crmebN/pages/orders-con/orders-con.js b/application/routine/view/crmebN/pages/orders-con/orders-con.js
index 0160c1b1..ba441a9a 100644
--- a/application/routine/view/crmebN/pages/orders-con/orders-con.js
+++ b/application/routine/view/crmebN/pages/orders-con/orders-con.js
@@ -51,7 +51,7 @@ Page({
var jsConfig = res.data.data.result.jsConfig;
console.log(jsConfig);
wx.requestPayment({
- timeStamp: jsConfig.timestamp,
+ timeStamp: jsConfig.timeStamp,
nonceStr: jsConfig.nonceStr,
package: jsConfig.package,
signType: jsConfig.signType,
diff --git a/application/routine/view/crmebN/pages/pink-list/index.js b/application/routine/view/crmebN/pages/pink-list/index.js
deleted file mode 100644
index 311d0df1..00000000
--- a/application/routine/view/crmebN/pages/pink-list/index.js
+++ /dev/null
@@ -1,116 +0,0 @@
-// pages/pink-list/index.js
-var app = getApp();
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- url: app.globalData.urlImages,
- banner:[],
- offset:0,
- limit:20,
- CombinationList:[]
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
- app.setBarColor();
- this.getCombinationList();
- this.getBanner();
- },
- getBanner:function(){
- var that = this;
- wx.request({
- url: app.globalData.url + '/routine/auth_api/get_combination_list_banner?uid=' + app.globalData.uid,
- method: 'GET',
- dataType: 'json',
- success: function (res) {
- that.setData({
- banner: res.data.data
- })
- console.log(that.data.banner);
- }
- })
- },
- getCombinationList:function(){
- var that = this;
- wx.request({
- url: app.globalData.url + '/routine/auth_api/get_combination_list?uid=' + app.globalData.uid,
- data:{
- offset: that.data.offset,
- limit:that.data.limit
- },
- method: 'GET',
- dataType: 'json',
- success: function(res) {
- that.setData({
- CombinationList:res.data.data
- })
- }
- })
- },
- goDetail:function(e){
- wx.request({
- url: app.globalData.url + '/routine/auth_api/get_form_id?uid=' + app.globalData.uid,
- method: 'GET',
- data: {
- formId: e.detail.formId
- },
- success: function (res) { }
- })
- wx.navigateTo({
- url: '/pages/product-pinke/index?id=' + e.detail.value.id,
- })
- },
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- }
-})
\ No newline at end of file
diff --git a/application/routine/view/crmebN/pages/pink-list/index.json b/application/routine/view/crmebN/pages/pink-list/index.json
deleted file mode 100644
index 225c492b..00000000
--- a/application/routine/view/crmebN/pages/pink-list/index.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "navigationBarTitleText": "拼团列表"
-}
\ No newline at end of file
diff --git a/application/routine/view/crmebN/pages/pink-list/index.wxml b/application/routine/view/crmebN/pages/pink-list/index.wxml
deleted file mode 100644
index 9ca90a9b..00000000
--- a/application/routine/view/crmebN/pages/pink-list/index.wxml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{item.title}}
-
- 已拼{{item.sales}}单
- ￥{{item.product_price}}
-
-
- 开团价：{{item.price}}元
-
-
-
-
-
-
-
-
-
diff --git a/application/routine/view/crmebN/pages/pink-list/index.wxss b/application/routine/view/crmebN/pages/pink-list/index.wxss
deleted file mode 100644
index f3244d25..00000000
--- a/application/routine/view/crmebN/pages/pink-list/index.wxss
+++ /dev/null
@@ -1,17 +0,0 @@
-.banner image{width: 100%; height: 300rpx;}
-.pink-list-wrapper{padding: 0 20rpx;}
-.pink-list-wrapper .item{margin-top: 10rpx; background-color: #fff;}
-.pink-list-wrapper .item navigator{width: 100%; justify-content: space-between;}
-.pink-list-wrapper .item image{width: 253rpx; height: 253rpx;}
-.pink-list-wrapper .item .pro-info{width: 426rpx; padding-right: 30rpx; box-sizing: border-box; flex-direction: column;justify-content: space-around;}
-.pink-list-wrapper .item .pro-info .title{display: -webkit-box; display:-moz-box; display:box;-webkit-box-orient: vertical; -moz-box-orient: vertical; -webkit-line-clamp: 2;-moz-line-clamp: 2;overflow: hidden;}
-.pink-list-wrapper .item .pro-info .price-wrapper{font-size: 24rpx; color: #767676;}
-.pink-list-wrapper .item .pro-info .price-wrapper .old-price{text-decoration: line-through; color: #aaa; margin-left: 10rpx;}
-.pink-list-wrapper .item .pro-info .count-wrapper{position: relative; width: 100%;height:55rpx; background-color: #e9e9e9; font-size: 24rpx; justify-content: space-between; border-radius: 0 15px 15px 0; align-self: center;}
-.pink-list-wrapper .item .pro-info .count-wrapper .text-bar{width: 145rpx; height: 100%;background-color: #ff3d3d; color: #fff; border-radius: 0 15px 15px 0; text-align: center; line-height: 55rpx;font-size:26rpx;}
-.pink-list-wrapper .item .pro-info .count-wrapper .price{flex: 1; padding-right: 15rpx; text-align: right; line-height: 55rpx;}
-.pink-list-wrapper .item .pro-info .count-wrapper .icon{width: 49rpx; height: 45rpx; background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADEAAAAtCAYAAAAHiIP8AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3JpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0Y2FmY2JiMi0xZWY2LTU0NGMtYTk4YS02Yjc2NDdkY2Y2NTkiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OTkxODE3Njc0NDc5MTFFOEEzMDhFNjg0NEI3QUM4QkIiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OTkxODE3NjY0NDc5MTFFOEEzMDhFNjg0NEI3QUM4QkIiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDplNmUwNDQ3NS05MjY2LTViNDYtYjBmNi02ZGY5NjkwMzFjNmIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGNhZmNiYjItMWVmNi01NDRjLWE5OGEtNmI3NjQ3ZGNmNjU5Ii8+IDwv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'); background-size: 100% 100%; position: absolute; left: 12rpx; top: -6rpx;}
-
-
-
-
diff --git a/application/routine/view/crmebN/project.config.json b/application/routine/view/crmebN/project.config.json
index e2eba4ec..620b4c3d 100644
--- a/application/routine/view/crmebN/project.config.json
+++ b/application/routine/view/crmebN/project.config.json
@@ -10,7 +10,7 @@
"compileType": "miniprogram",
"libVersion": "1.9.94",
"appid": "wx7bc36cccc15e4be2",
- "projectname": "crmebn",
+ "projectname": "crmebn_831",
"condition": {
"search": {
"current": -1,