Skip to content

N
nyx
Commit 8c84e0d3 by jscat
Options

nyx weapp: 功能更新 

1. 调整上次活动发布不成功的错误
parent 84a15fa2
正在显示 包含 147 行增加 和 76 行删除
增值产品-小程序及app/nyx-master/app.js
//app.js
//app.js
......@@ -10,15 +10,16 @@ App({
authStatus: "", //授权状态, 00表示未授权, 01表示已授权
userInfo : {}, //用户信息
members : [], // 商家列表
memberInfo: {
member_id: "",
address_id: "",
default_member: "",
member_name: "",
member_address: "",
member_slogan: "",
member_logo: "",
}, // 商家信息
memberInfo: {},
// member_id: "",
// address_id: "",
// default_member: "",
// member_name: "",
// member_city: "",
// member_address: "",
// member_slogan: "",
// member_logo: "",
//}, // 商家信息
emotionHost : "https://930-test-sh.oss-cn-shanghai.aliyuncs.com/emoji/",
onOpenOp : {},
......
增值产品-小程序及app/nyx-master/app.json
{
{
{
"pages": [
"pages": [
"pages/activity/activity",
"pages/mall/order/order",
"pages/member/activity-post/activity-submit/activity-submit",
"pages/activity/activity-list/activity-list",
"pages/my/my-members/my-members",
"pages/member/activity-post/activity-edit/activity-edit",
"pages/member/activity-post/activity-submit/activity-submit",
"pages/member/quiz-post/quiz-edit/quiz-edit",
"pages/member/schedule/schedule",
"pages/member/activity-post/activity-post",
......
增值产品-小程序及app/nyx-master/config.js
//config.js API全局域名配置
//config.js API全局域名配置
......@@ -3,7 +3,7 @@
// env = 0; //本地java测试，需要启动java后台
// env = 1; //阿里云服务器测试版本
// env = 2; //阿里云服务器生产版本
var env = 0;
var env = 1;
var debug = 0; //是否打印调试信息
var host_key = "https://fun.hisuhong.com";
......@@ -25,9 +25,9 @@ else if(env == 1)
}else if(env == 0)
{
debug = 1
host_key = "http://localhost:8085";
host_key = "http://localhost:8086";
login_url = "https://wx.hisuhong.com";
socket_url = "ws://localhost:8085/websocket/chat"
socket_url = "ws://localhost:8086/websocket/chat"
}
var config={
......@@ -59,7 +59,7 @@ var config={
product_query_url: host_key + "/api/nyx/product/query",
member_query_url: host_key + "/api/nyx/member/query",
socket_url: socket_url,
oss_token_url: login_url + "/api/nyx/oss/getToken",
oss_token_url: login_url + "/api/nyx/oss/getToken",
oss_callback_url: login_url + "/api/nyx/oss/callback",
oss_member_callback_url: login_url + "/api/nyx/oss/member/callback",
oss_activity_callback_url: login_url + "/api/nyx/oss/activity/callback",
......
增值产品-小程序及app/nyx-master/pages/activity/activity.js
// pages/activity/activity.js
// pages/activity/activity.js
......@@ -18,6 +18,7 @@ Page({
authStatus : "", // 授权状态: 00-未授权, 01-已授权
userInfo : {},
members : "", // 商家信息
memberInfo : {},
city: "",
county: "",
......@@ -637,6 +638,7 @@ Page({
//表示HTTP请求成功
console.log(res.data);
var members = []
var memberInfo = {}
if(res.data.data.length > 0)
{
......@@ -658,6 +660,8 @@ Page({
wx.setStorageSync('memberInfo', members[0])
app.globalData.memberInfo = members[0]
app.globalData.members = members
memberInfo = members[0]
_this.setData({ memberInfo})
}
}
......
增值产品-小程序及app/nyx-master/pages/activity/activity.wxml
<wxs module="tutil" src="./../../utils/date.wxs"></wxs>
<wxs module="tutil" src="./../../utils/date.wxs"></wxs>
......@@ -31,12 +31,12 @@
<view class="workbench">
<view class="list">
<!-- jscat todo 0828 以用户为主, 扫一扫暂时也不实现 -->
<view class="items">
<!-- <view class="items">
<view bindtap="getQRCode">
<image src="../../icon/activity/scan.png"></image>
</view>
<text>扫一扫</text>
</view>
</view> -->
<!-- todo 0820 以活动为主, 积分暂时也不实现 -->
<!-- <view class="items">
<navigator url="/pages/my/my-points/my-points">
......@@ -67,7 +67,7 @@
<navigator url="/pages/my/my-orders/my-orders">
<image src="../../icon/activity/order.png" style="margin-top:10rpx; margin-bottom:-10rpx"></image>
</navigator>
<text>我的活动</text>
<text>我的预订</text>
</view>
</view>
......
增值产品-小程序及app/nyx-master/pages/member/activity-post/activity-edit/activity-edit.js
// pages/member/activity-post/activity-edit/activity-edit.js
// pages/member/activity-post/activity-edit/activity-edit.js
......@@ -31,13 +31,7 @@ Page({
scrollTop: a-200
})
}
})
var products = [{ productDesc: "", unitPrice: 0, quantity: 0, }]
_this.setData({
products: products,
});
})
var date = ""
var startDate = ""
......@@ -46,6 +40,7 @@ Page({
var endTime = "23:30"
var title =""
var content = ""
var products = []
// 如果startDatetime有值
if(app.globalData.postData.startDatetime != "")
{
......@@ -72,6 +67,12 @@ Page({
endDate = date
}
//如果未设置products, 初始值为""
if(products.length == 0)
{
products = [{ productDesc: "", unitPrice: 0, quantity: 0, }]
}
//设置本地变量
_this.setData({
startDate: startDate,
......@@ -82,9 +83,9 @@ Page({
content: content,
products: products,
});
// //设置全局变量
// app.globalData.postData.startDatetime = startDate + " " + startTime + ":00"
// app.globalData.postData.endDatetime = endDate + " " + endTime + ":00"
//设置全局变量
app.globalData.postData.startDatetime = startDate + " " + startTime + ":00"
app.globalData.postData.endDatetime = endDate + " " + endTime + ":00"
},
onReady: function (e) {
......
增值产品-小程序及app/nyx-master/pages/member/activity-post/activity-edit/activity-edit.wxml
<!-- /page/post/edit/edit 添加分类的特点，以及自定义特点 -->
<!-- /page/post/edit/edit 添加分类的特点，以及自定义特点 -->
......@@ -4,11 +4,11 @@
<button type="default" bindtap="navigateToSubmit">下一步</button>
</block>
<view class="weui-cells__title">#添加标题</view>
<view class="weui-cells__title">#添加活动标题</view>
<view class="weui-cells weui-cells_after-title">
<view class="weui-cell ">
<view class="weui-cell__bd">
<input class="weui-input" bindinput="bindKeyTitle" placeholder="请输入标题" value="{{title}}"/>
<input class="weui-input" bindinput="bindKeyTitle" placeholder="请输入活动标题" value="{{title}}"/>
</view>
</view>
</view>
......
增值产品-小程序及app/nyx-master/pages/member/activity-post/activity-post.js
// pages/member/activity-post/activity-post.js
// pages/member/activity-post/activity-post.js
......@@ -85,6 +85,18 @@ Page({
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
var _this = this;
// 通过全局变量来同步本地变量local variable
// 否则本地变量会有脏数据
var photoArray = app.globalData.postData.photoArray
_this.setData({ photoArray })
},
// Page Flow
onNavigateToEdit() {
var _this = this;
......
增值产品-小程序及app/nyx-master/pages/member/activity-post/activity-post.wxml
<!-- /pages/member/activity-post/activity-post.wxml -->
<!-- /pages/member/activity-post/activity-post.wxml -->
......@@ -10,7 +10,7 @@
<view class="weui-cell__bd">
<view class="weui-uploader">
<view class="weui-uploader__hd">
<view class="weui-uploader__title">图片上传</view>
<view class="weui-uploader__title">活动图片上传</view>
<view class="weui-uploader__info">{{photoArray.length}}/{{count[countIndex]}}</view>
</view>
<view class="weui-uploader__bd">
......
增值产品-小程序及app/nyx-master/pages/member/activity-post/activity-submit/activity-submit.js
// pages/member/activity-post/activity-submit/activity-submit.js
// pages/member/activity-post/activity-submit/activity-submit.js
......@@ -28,6 +28,7 @@ Page({
address_id
default_member
member_name
member_city // new added jscat 20200915
member_address
member_slogan
member_logo
......@@ -46,6 +47,8 @@ Page({
// 消息提示框的遮罩层
showToast: false,
defaultCity: '',
},
onLoad: function () {
......@@ -69,7 +72,7 @@ Page({
})
}
var members = wx.getStorageSync('members')
var members = wx.getStorageSync('members') || []
if(members.length != 0)
{
var logoArray = [ members[0].member_logo ]
......@@ -81,9 +84,15 @@ Page({
{
content = app.globalData.postData.photoContent; //获取content
}
_this.setData({ content })
var defaultCity = app.globalData.defaultCity
_this.setData({ defaultCity })
var memberInfo = app.globalData.memberInfo || {}
memberInfo["member_city"] = defaultCity
app.globalData.memberInfo = memberInfo
},
onReady: function (e) {
......@@ -102,8 +111,6 @@ Page({
var _this = this;
var title = app.globalData.postData.photoTitle
var content = app.globalData.postData.photoContent; //获取content
var member_name = app.globalData.memberInfo.member_name
var member_address = app.globalData.memberInfo.member_address
var logoArray = _this.__data__.logoArray
// user_id
......@@ -134,8 +141,7 @@ Page({
// 提交活动
// 存入数据库
// 成功之后返回activity页面
_this.releaseOss(title, content);
_this.switchTab()
_this.releaseOss(title, content);
},
function (value) {
console.log("===enter promise_regMember then_failed_" + value)
......@@ -332,11 +338,9 @@ Page({
console.log(res)
console.log("success to upload file")
_this.switchTab()
//resolve(res.data);
},
fail: function (err) {
console.log("fail to upload file")
//reject(new Error('failed to upload file'));
},
complete: function () {
console.log("complete to upload file");
......@@ -386,8 +390,16 @@ Page({
//跳转到/activity.wxml页面
app.globalData.switchId = 1
// 处理数据
app.globalData.postData = {}
// 重置数据
app.globalData.postData = {
photoArray: [],
photoTag: "",
photoTitle: "",
photoContent: "",
photoProduct: [],
startDatetime: "",
endDatetime: "",
}
// jscat 20200913 消息提示框
/*
......@@ -480,15 +492,36 @@ Page({
},
// 添加口号
bindSlogan(e) {
app.globalData.memberInfo.member_slogan = e.detail.value
var _this = this;
var memberInfo = _this.data.memberInfo || {}
memberInfo["member_slogan"] = e.detail.value
app.globalData.memberInfo = memberInfo
_this.setData({ memberInfo })
},
// 添加名称
bindName(e) {
app.globalData.memberInfo.member_name = e.detail.value
var _this = this;
var memberInfo = _this.data.memberInfo || {}
memberInfo["member_name"] = e.detail.value
app.globalData.memberInfo = memberInfo
_this.setData({ memberInfo })
},
// 添加城市
// jscat 20200915,
bindCity(e) {
var _this = this;
var memberInfo = _this.data.memberInfo || {}
memberInfo["member_city"] = e.detail.value
app.globalData.memberInfo = memberInfo
_this.setData({ memberInfo })
},
//添加地址
bindAddress(e) {
app.globalData.memberInfo.member_address = e.detail.value
var _this = this;
var memberInfo = _this.data.memberInfo || {}
memberInfo["member_address"] = e.detail.value
app.globalData.memberInfo = memberInfo
_this.setData({ memberInfo })
},
......@@ -538,7 +571,9 @@ Page({
var member_id = "mid_" + util.wxuuid()
app.globalData.memberInfo.member_id = member_id
var member_name = app.globalData.memberInfo.member_name
var member_address = app.globalData.memberInfo.member_address
var member_address = app.globalData.memberInfo.member_city + app.globalData.memberInfo.member_address
//即时更新member_address的值
app.globalData.memberInfo.member_address = member_address
var member_slogan = app.globalData.memberInfo.member_slogan
var user_id = _this.__data__.nyxCode
......@@ -575,7 +610,9 @@ Page({
var address_id = "addid_" + util.wxuuid()
app.globalData.memberInfo.member_id = member_id
var member_name = app.globalData.memberInfo.member_name
var member_address = app.globalData.memberInfo.member_address
var member_address = app.globalData.memberInfo.member_city + app.globalData.memberInfo.member_address
//即时更新member_address的值
app.globalData.memberInfo.member_address = member_address
var member_slogan = app.globalData.memberInfo.member_slogan
var logoArray = _this.__data__.logoArray
......@@ -590,7 +627,7 @@ Page({
if (expire == undefined || expireNow > expire) {
//重新获取oss, 成功之后执行uploadMember()
let promise_oss = new Promise(function (resolve) {
_this.oss_promise('userToken', resolve)
_this.oss_promise('logoToken', resolve)
})
promise_oss.then(
......@@ -639,11 +676,14 @@ Page({
var member_logo = path + image
var user_id = _this.__data__.nyxCode
//设置memberInfo全局函数
app.globalData.memberInfo.member_logo = member_logo
app.globalData.memberInfo.member_status = "01"
app.globalData.memberInfo.default_member = "01"
app.globalData.memberInfo.address_id = address_id
app.globalData.memberInfo.member_id = member_id
app.globalData.memberInfo['member_logo'] = member_logo
app.globalData.memberInfo['member_status'] = "01"
app.globalData.memberInfo['default_member'] = "01"
app.globalData.memberInfo['address_id'] = address_id
app.globalData.memberInfo['member_id'] = member_id
app.globalData.memberInfo['member_name'] = member_name
app.globalData.memberInfo['member_address'] = member_address
app.globalData.memberInfo['member_slogan'] = member_slogan
var strUrl = config.oss_member_callback_url
......
增值产品-小程序及app/nyx-master/pages/member/activity-post/activity-submit/activity-submit.wxml
<view class="page-body">
<view class="page-body">
......@@ -12,11 +12,11 @@
</block>
</view>
<view class="weui-cells__title">#添加内容</view>
<view class="weui-cells__title">#添加活动内容</view>
<view class="weui-cells weui-cells_after-title">
<view class="weui-cell">
<view class="weui-cell__bd">
<textarea auto-height="{{auto_height}}" bindblur='areablur' bindfocus='areafocus' class="weui-textarea" bindinput='bindKeyInput' name="inputContent" placeholder="请输入内容" style="height: 3.3em" value="{{content}}"/>
<textarea auto-height="{{auto_height}}" bindblur='areablur' bindfocus='areafocus' class="weui-textarea" bindinput='bindKeyInput' name="inputContent" placeholder="请输入活动内容" style="height: 3.3em" value="{{content}}"/>
<view class="weui-textarea-counter">{{content.length}}/300</view>
</view>
</view>
......@@ -28,12 +28,12 @@
<view class="weui-cell__bd">
<view class="weui-uploader">
<view class="weui-uploader__hd">
<view class="weui-uploader__title">商家信息</view>
<view class="weui-uploader__title">{{members.length==0?'完善5项商家信息, 直接发布活动':'商家信息'}}</view>
</view>
<!-- 地址 -->
<view class="weui-uploader__hd">
<block wx:if="{{members.length==0}}">
<input class="weui-input" bindinput="bindSlogan" placeholder="请输入口号" />
<input class="weui-input" bindinput="bindSlogan" placeholder="1、请输入店铺标语" />
</block>
<block wx:else>
{{members[0].member_slogan}}
......@@ -54,6 +54,8 @@
<block wx:if="{{logoArray.length == 0}}">
<view class="weui-uploader__input-box">
<view class="weui-uploader__input" bindtap="addLogo"></view>
<!-- <view class="weui-uploader__title">商家信息</view> -->
<view style="color: rgba(0,0,0,.5);font-size:30rpx;">2、添加Logo</view>
</view>
</block>
</view>
......@@ -65,7 +67,7 @@
<view>
<view class="weui-cell__bd">
<block wx:if="{{members.length==0}}">
<input class="weui-input" bindinput="bindName" placeholder="请输入名称" />
<input class="weui-input" bindinput="bindName" placeholder="3、请输入店铺名称" />
</block>
<block wx:else>
{{members[0].member_name}}
......@@ -75,14 +77,26 @@
</view>
<!-- end of note-column-->
<!-- start of note-column-->
<block wx:if="{{members.length==0}}">
<view class="weui-cells weui-cells_after-title" style="height: 96rpx">
<view>
<view class="weui-cell__bd">
<input class="weui-input" bindinput="bindCity" value="{{defaultCity}}" placeholder="4、请输入店铺城市">
</input>
</view>
</view>
</view>
</block>
<!-- end of note-column-->
<!-- start of note-column-->
<view class="weui-cells weui-cells_after-title" style="height: 96rpx">
<view>
<view class="weui-cell__bd">
<block wx:if="{{members.length==0}}">
<input class="weui-input" bindinput="bindAddress" placeholder="请输入地址" />
<input class="weui-input" bindinput="bindAddress" placeholder="5、请输入店铺地址" />
</block>
<block wx:else>
{{members[0].member_address}}
{{members[0].member_city}}{{members[0].member_address}}
</block>
</view>
</view>
......
增值产品-小程序及app/nyx-master/pages/my/my-orders/my-orders.js
// pages/my/my-orders/my-orders.js
// pages/my/my-orders/my-orders.js
......@@ -205,7 +205,6 @@ Page({
var _this = this;
var userId = _this.data.nyxCode
var query_url = '&orderStatus='+orderStatus + '&userId='+userId
query_url = '&orderStatus='+orderStatus
var strUrl = config.order_detail_query_url + "?pageCount=" + pageCount
+ "&pageNum=" + pageNum + query_url
config.debug == 1 ? console.log("===strUrl is: \"" + strUrl + "\"") : ""
......
增值产品-小程序及app/nyx-master/pages/my/my.wxml
<view class="page">
<view class="page">
......@@ -36,7 +36,7 @@
<view class="weui-cell__hd">
<image src="/icon/my/activity.png" />
</view>
<view class="weui-cell__bd">我的活动</view>
<view class="weui-cell__bd">我的预订</view>
<view class="weui-cell__ft weui-cell__ft_in-access"></view>
</navigator>
<navigator class="weui-cell weui-cell_access" hover-class="weui-cell_active" url="/pages/my/my-collects/my-collects">
......
增值产品-小程序及app/nyx-master/pages/my/user/user.wxml
<view class="page">
<view class="page">
......@@ -25,7 +25,7 @@
</view>
</view>
<view class="grade">
<image class="grade-icon" src="/icon/grade-img.png"></image>
<!-- <image class="grade-icon" src="/icon/grade-img.png"></image> -->
<span>等级：</span>
</view>
<view class="userDesc">
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论