Kaynağa Gözat

upload

dev_czc
HolyKnightIX 2 yıl önce
ebeveyn
işleme
7fc62a4e8e
27 değiştirilmiş dosya ile 85 ekleme ve 112 silme
  1. +4
    -4
      app.json
  2. +24
    -20
      ext.json
  3. +4
    -4
      index/user.js
  4. +3
    -3
      index/user.wxml
  5. +1
    -0
      pages/czdetail/czdetail.wxml
  6. +1
    -1
      pages/getphoneInfo/index.js
  7. +5
    -5
      pages/index/index.js
  8. +0
    -15
      pages/logs/logs.js
  9. +0
    -3
      pages/logs/logs.json
  10. +0
    -6
      pages/logs/logs.wxml
  11. +0
    -8
      pages/logs/logs.wxss
  12. +20
    -20
      pages/main/index.js
  13. +5
    -5
      pages2/fengMap/fengMap.js
  14. +15
    -15
      pages3/complaint/complaint.js
  15. +0
    -0
      pages3/complaint/complaint.json
  16. +0
    -0
      pages3/complaint/complaint.wxml
  17. +0
    -0
      pages3/complaint/complaint.wxss
  18. +0
    -0
      pages3/exchange/exchange.js
  19. +0
    -0
      pages3/exchange/exchange.json
  20. +1
    -1
      pages3/exchange/exchange.wxml
  21. +0
    -0
      pages3/exchange/exchange.wxss
  22. +0
    -0
      pages3/exchangeCard/exchangeCard.js
  23. +0
    -0
      pages3/exchangeCard/exchangeCard.json
  24. +0
    -0
      pages3/exchangeCard/exchangeCard.wxml
  25. +0
    -0
      pages3/exchangeCard/exchangeCard.wxss
  26. +1
    -1
      project.config.json
  27. +1
    -1
      project.private.config.json

+ 4
- 4
app.json Dosyayı Görüntüle

@@ -52,8 +52,6 @@
"pages/payrule/payrule",
"pages/grade/grade",
"pages/gradeII/gradeII",
"pages/exchange/exchange",
"pages/exchangeCard/exchangeCard",
"pages/game/index",
"pages/canvas/index",
"pages/specialcourtesy/specialcourtesy",
@@ -74,7 +72,6 @@
"components/dateLsit/dateLsit",
"pages/dateLsit/dateLsit",
"pages/activityCalendar/activityCalendar",
"pages/complaint/complaint",
"pages/questionnaire/questionnaire",
"pages/questionnaire/questionnaireLsit/questionnaireLsit",
"pages/site/site",
@@ -100,7 +97,10 @@
"name": "pages3",
"pages": [
"setUserInfo/index",
"userProtocol/userProtocol"
"userProtocol/userProtocol",
"exchangeCard/exchangeCard",
"exchange/exchange",
"complaint/complaint"
]
}
],


+ 24
- 20
ext.json Dosyayı Görüntüle

@@ -2,35 +2,44 @@
"ext": {
"attr": {
"car": {
"tjd": {
"payPath": "",
"tjdAppId": "wx6945d1bda68d7993"
},
"etcp": {
"etcpAppId": "wx192b7d2e8dcbefd0",
"etcpVersion": "release",
"etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback"
}
"payPath": "pages/pay/order-pay-open/main",
"etcpAppId": "wxc07f9d67923d676d",
"etcpCallbackUrl": "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback"
},
"bolink": {
"payPath": "pages/park/park",
"bolinkAppId": "wxbd08b4baa10fcc1d"
},
"version": "release"
},
"mchId": "1604439800",
"mchId": "1539123951",
"imgProxy": [
{
"newUrl": "https://ctest.malls.iformall.com/img",
"newUrl": "https://c.malls.iformall.com/img",
"orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com"
},
{
"newUrl": "https://ctest.malls.iformall.com/img1",
"newUrl": "https://c.malls.iformall.com/img1",
"orgUrl": "https://formall.oss-accelerate.aliyuncs.com"
},
{
"newUrl": "https://ctest.malls.iformall.com/img2",
"newUrl": "https://c.malls.iformall.com/img2",
"orgUrl": "https://wx.qlogo.cn"
}
],
"configUrl": "https://ctest.malls.iformall.com/C/api",
"businessSwitch": "1",
"configUrl": "https://c.malls.iformall.com/C/api",
"ifStoreApp": "0",
"ifHaveWebSocket": "0",
"ifHaveCarModular": "1"
},
"name": "金泸商务",
"weappId": "wx649b3be73c1afe47",
"appVersion": "C.test.5.2.0"
"name": "欢乐城万象金街",
"weappId": "wxde54451891094c16",
"appVersion": "C.5.1.1"
},
"debug": false,
"tabBar": {
@@ -66,8 +75,7 @@
"selectedIconPath": "assets/images/user-a.png"
}
],
"color": "#abb1be",
"selectedColor": "#b2743d"
"custom": true
},
"window": {
"backgroundTextStyle": "dark",
@@ -76,16 +84,12 @@
"navigationBarBackgroundColor": "#FFFFFF"
},
"plugins": {
"auto-points-plugin": {
"version": "1.3.0",
"provider": "wxfab2bf944bfc4da6"
},
"live-player-plugin": {
"version": "1.3.4",
"provider": "wx2b03c6e691cd7370"
}
},
"extAppid": "wx649b3be73c1afe47",
"extAppid": "wxde54451891094c16",
"extEnable": true,
"permission": {
"scope.userLocation": {


+ 4
- 4
index/user.js Dosyayı Görüntüle

@@ -302,11 +302,11 @@ Page({

goToExchangeCard() {
wx.navigateTo({
url: '/pages/exchangeCard/exchangeCard',
url: '/pages3/exchangeCard/exchangeCard',
})
// if (this.data.ifSetUserInfo) {
// wx.navigateTo({
// url: '/pages/exchangeCard/exchangeCard',
// url: '/pages3/exchangeCard/exchangeCard',
// })
// } else {
// wx.navigateTo({
@@ -333,11 +333,11 @@ Page({
goToComplaint() {
if (this.data.ifSetUserInfo) {
wx.navigateTo({
url: '/pages/complaint/complaint',
url: '/pages3/complaint/complaint',
})
} else {
wx.navigateTo({
url: '/pages/complaint/complaint',
url: '/pages3/complaint/complaint',
})
// wx.navigateTo({
// url: `/pages/getphoneInfo/index?mineFlag=mine`,


+ 3
- 3
index/user.wxml Dosyayı Görüntüle

@@ -77,7 +77,7 @@
<text class="view" style='color:{{view}}'>更多成长值</text>
</view>

<view bindtap='gotointegralmall'>
<view bindtap='goToIntegralmall'>
<text class="integral">我的积分:{{credit}}</text>
<text class="my my_line">|</text>
<!-- <text class="my">更多成长值</text> -->
@@ -162,7 +162,7 @@
</view>
</view>

<!-- <navigator url="/pages/exchange/exchange" open-type="navigate">
<!-- <navigator url="/pages3/exchange/exchange" open-type="navigate">
<view class="particulars_list">
<view class="particulars_name">兑换</view>
<view class="particulars_go">></view>
@@ -247,7 +247,7 @@
</view>
</navigator> -->
<!-- 兑换 -->
<!-- <navigator url="/pages/exchange/exchange" open-type="navigate">
<!-- <navigator url="/pages3/exchange/exchange" open-type="navigate">
<view class="user-btn app-border-bottom">
<view>
<image class='icons' src="{{duihuan}}" mode='widthFix'></image>兑换</view>


+ 1
- 0
pages/czdetail/czdetail.wxml Dosyayı Görüntüle

@@ -19,6 +19,7 @@
<text wx:if="{{item.scoreType==6}}">微信用户手机授权</text>
<text wx:if="{{item.scoreType==7}}">完善个人信息</text>
<text wx:if="{{item.scoreType==8}}">会员导入</text>
<text wx:if="{{item.scoreType==27}}">活动报名奖励</text>
<text wx:if="{{item.scoreType==9}}">{{item.reason}}</text>
<text>{{item.createDate}}</text>
</view>


+ 1
- 1
pages/getphoneInfo/index.js Dosyayı Görüntüle

@@ -257,7 +257,7 @@ Page({
});
} else if (that.data.path == 'exchangeCard') {
wx.navigateTo({
url: `/pages/exchangeCard/exchangeCard`
url: `/pages3/exchangeCard/exchangeCard`
})
} else if (that.data.path == 'searchbarDetail') {
wx.navigateTo({


+ 5
- 5
pages/index/index.js Dosyayı Görüntüle

@@ -216,7 +216,7 @@ Page({
//投诉建议
else if (app.globalData.type == 'ts') {
wx.redirectTo({
url: `/pages/complaint/complaint`,
url: `/pages3/complaint/complaint`,
})
}
// 宣传页详情
@@ -350,7 +350,7 @@ Page({
else if (app.globalData.type == 'se') {
// 录入电子卡
wx.redirectTo({
url: '/pages/exchangeCard/exchangeCard'
url: '/pages3/exchangeCard/exchangeCard'
})
}
//直播
@@ -380,7 +380,7 @@ Page({
// 兑换
else if (app.globalData.type == 'ec') {
wx.redirectTo({
url: '/pages/exchange/exchange'
url: '/pages3/exchange/exchange'
})
}
// 通过分享进入的门店详情
@@ -546,13 +546,13 @@ Page({
else if (app.globalData.type == 'se') {
// 录入电子卡
wx.redirectTo({
url: '/pages/exchangeCard/exchangeCard'
url: '/pages3/exchangeCard/exchangeCard'
})
}
// 兑换
else if (app.globalData.type == 'ec') {
wx.redirectTo({
url: '/pages/exchange/exchange'
url: '/pages3/exchange/exchange'
})
}
// 门店


+ 0
- 15
pages/logs/logs.js Dosyayı Görüntüle

@@ -1,15 +0,0 @@
//logs.js
const util = require('../../utils/util.js')

Page({
data: {
logs: []
},
onLoad: function () {
this.setData({
logs: (wx.getStorageSync('logs') || []).map(log => {
return util.formatTime(new Date(log))
})
})
}
})

+ 0
- 3
pages/logs/logs.json Dosyayı Görüntüle

@@ -1,3 +0,0 @@
{
"navigationBarTitleText": "查看启动日志"
}

+ 0
- 6
pages/logs/logs.wxml Dosyayı Görüntüle

@@ -1,6 +0,0 @@
<!--logs.wxml-->
<view class="container log-list">
<block wx:for="{{logs}}" wx:for-item="log">
<text class="log-item">{{index + 1}}. {{log}}</text>
</block>
</view>

+ 0
- 8
pages/logs/logs.wxss Dosyayı Görüntüle

@@ -1,8 +0,0 @@
.log-list {
display: flex;
flex-direction: column;
padding: 40rpx;
}
.log-item {
margin: 10rpx;
}

+ 20
- 20
pages/main/index.js Dosyayı Görüntüle

@@ -11,7 +11,7 @@ Page({
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
onLoad: function (options) {
let that = this;
console.log(options, "跳转地址栏");
wx.showToast({
@@ -105,7 +105,7 @@ Page({
/**
* 检查用户的状态
*/
userStatus: function(options) {
userStatus: function (options) {
var that = this;
if (options && (options.couponChannelId || options.orderId || options.id)) {
that.checkuserstatus(options);
@@ -135,11 +135,11 @@ Page({
let that = this;

Http.get({
url: config.api.checkUserStatus,
data: {
token: app.globalData.token
}
})
url: config.api.checkUserStatus,
data: {
token: app.globalData.token
}
})
.then(res => {
// res = JSON.parse('{"code":11004,"message":"用户昵称未授权,请跳转到用户昵称授权页!","data":{}}')
//参与拼团
@@ -341,7 +341,7 @@ Page({
// 兑换
else if (app.globalData.type == 'ec') {
wx.redirectTo({
url: '/pages/exchange/exchange'
url: '/pages3/exchange/exchange'
})
}
// 通过分享进入的门店详情
@@ -514,7 +514,7 @@ Page({
// 兑换
else if (app.globalData.type == 'ec') {
wx.redirectTo({
url: '/pages/exchange/exchange'
url: '/pages3/exchange/exchange'
})
}
// 门店
@@ -531,25 +531,25 @@ Page({
})
},

getGameOne: function(token, id) {
getGameOne: function (token, id) {
let _this = this;
Http.get({
url: config.api.getOneGame,
data: {
token: token,
id: id
}
}).then(res => {
wx.redirectTo({
url: '/pages/game/index?url=' + res.data.url + "&id=" + res.data.id + "&gameId=" + res.data.gameId,
})
url: config.api.getOneGame,
data: {
token: token,
id: id
}
}).then(res => {
wx.redirectTo({
url: '/pages/game/index?url=' + res.data.url + "&id=" + res.data.id + "&gameId=" + res.data.gameId,
})
})
.catch(err => {
wx.showModal({
title: '提示',
content: err.message,
showCancel: false,
success: function(res) {
success: function (res) {
// 如果游戏下架或者找不到,重启首页
if (res.confirm) {
wx.reLaunch({


+ 5
- 5
pages2/fengMap/fengMap.js Dosyayı Görüntüle

@@ -1,6 +1,6 @@
// pages/FMController/index.js

import { fengmap } from '../js/fengmap.miniprogram.min.js';
import { fengmap } from '../js/fengmap.miniprogram.min';
const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'
const Http = require("../../utils/HttpBasics");
const config = require("../../config/config");
@@ -16,11 +16,11 @@ Page({
mapGroupIDs: [],
is3D: true,
isAllLayer: false,
initMap:{},
initMap: {},
},
// 定义全局map变量
fmap: null,
canvas:null,
canvas: null,
/**
* 生命周期函数--监听页面加载
*/
@@ -66,10 +66,10 @@ Page({
mapServerURL: config.url + `/fengniaoMapfile/${this.data.initMap.tenantId}/${this.data.initMap.mapId}`,
mapThemeURL: config.url + `/fengniaoMapfile/${this.data.initMap.tenantId}/theme/`,
defaultThemeName: this.data.initMap.defaultThemeName,
defaultMapScaleLevel:19,
defaultMapScaleLevel: 19,
// compassOffset:[28,100]
};
console.log(canvas,"canvas")
console.log(canvas, "canvas")

//初始化地图对象
this.fmap = new fengmap.FMMap(mapOptions);


pages/complaint/complaint.js → pages3/complaint/complaint.js Dosyayı Görüntüle

@@ -1,4 +1,4 @@
// pages/complaint/complaint.js
// pages3/complaint/complaint.js
const Http = require("../../utils/HttpBasics");
var config = require("../../config/config.js");
var app = getApp();
@@ -27,18 +27,18 @@ Page({
})
},
save() { //提交
if (!this.data.titleVale){
if (!this.data.titleVale) {
wx.showToast({
title: '请输入标题',
icon: "none",
duration: 2000
})
return
}else if(!this.data.descrideVal){
} else if (!this.data.descrideVal) {
wx.showToast({
title: '请输入类容',
icon:"none",
duration:2000
icon: "none",
duration: 2000
})
return
}
@@ -49,8 +49,8 @@ Page({
Http.post({
url: config.api.suggest,
data: parameter
}).then(item=>{
let this_=this
}).then(item => {
let this_ = this
wx.showToast({
title: "提交成功!",
icon: 'none',
@@ -76,7 +76,7 @@ Page({
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
onLoad: function (options) {
this.setData({
goHomeUrl: app.globalData.goHomeUrl
})
@@ -85,49 +85,49 @@ Page({
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function() {
onReady: function () {

},

/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
onShow: function () {

},

/**
* 生命周期函数--监听页面隐藏
*/
onHide: function() {
onHide: function () {

},

/**
* 生命周期函数--监听页面卸载
*/
onUnload: function() {
onUnload: function () {

},

/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function() {
onPullDownRefresh: function () {

},

/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
onReachBottom: function () {

},

/**
* 用户点击右上角分享
*/
onShareAppMessage: function() {
onShareAppMessage: function () {

}
})

pages/complaint/complaint.json → pages3/complaint/complaint.json Dosyayı Görüntüle


pages/complaint/complaint.wxml → pages3/complaint/complaint.wxml Dosyayı Görüntüle


pages/complaint/complaint.wxss → pages3/complaint/complaint.wxss Dosyayı Görüntüle


pages/exchange/exchange.js → pages3/exchange/exchange.js Dosyayı Görüntüle


pages/exchange/exchange.json → pages3/exchange/exchange.json Dosyayı Görüntüle


pages/exchange/exchange.wxml → pages3/exchange/exchange.wxml Dosyayı Görüntüle

@@ -11,5 +11,5 @@
<view class="comment">
<text class="txt1">如何获取兑换码?</text>
<text class="txt2">1.实体卡卡密可刮开卡背面涂层查看;</text>
<text class="txt3">2.自己购买的电子卡,可到 我的订单 或 短信 查看详情;</text>
<text class="txt3">2.自己购买的电子卡,可到 我的订单 或 短信 查看详情;</text>
</view>

pages/exchange/exchange.wxss → pages3/exchange/exchange.wxss Dosyayı Görüntüle


pages/exchangeCard/exchangeCard.js → pages3/exchangeCard/exchangeCard.js Dosyayı Görüntüle


pages/exchangeCard/exchangeCard.json → pages3/exchangeCard/exchangeCard.json Dosyayı Görüntüle


pages/exchangeCard/exchangeCard.wxml → pages3/exchangeCard/exchangeCard.wxml Dosyayı Görüntüle


pages/exchangeCard/exchangeCard.wxss → pages3/exchangeCard/exchangeCard.wxss Dosyayı Görüntüle


+ 1
- 1
project.config.json Dosyayı Görüntüle

@@ -35,7 +35,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.11.2",
"appid": "wxfa336cad86ed598d",
"appid": "wx453ae0d37f3550d0",
"projectname": "C",
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},


+ 1
- 1
project.private.config.json Dosyayı Görüntüle

@@ -13,7 +13,7 @@
"list": [
{
"name": "exchangeCard",
"pathName": "pages/exchangeCard/exchangeCard",
"pathName": "pages3/exchangeCard/exchangeCard",
"query": "",
"launchMode": "default",
"scene": null


Yükleniyor…
İptal
Kaydet