Skip to content

N
nyx
Commit 9ac32196 by jscat
Options

nyx weapp: 

1. 添加member注册功能, member查询功能, 活动图片上传阿里云oss功能
2. 小程序端添加活动类别字段
3. 精细化活动上传流程
- 是否授权
- 是否注册
- 活动上传
parent 6c3c118d
正在显示 包含 397 行增加 和 134 行删除
增值产品-小程序及app/nyx-master/app.js
//app.js //app.js
...@@ -12,8 +12,11 @@ App({ ...@@ -12,8 +12,11 @@ App({
members : [], // 商家列表 members : [], // 商家列表
memberInfo: { memberInfo: {
member_id: "", member_id: "",
address_id: "",
default_member: "",
member_name: "", member_name: "",
member_address: "", member_address: "",
member_slogan: "",
member_logo: "", member_logo: "",
}, // 商家信息 }, // 商家信息
...@@ -51,7 +54,7 @@ App({ ...@@ -51,7 +54,7 @@ App({
photoTag: "", photoTag: "",
photoTitle: "", photoTitle: "",
photoContent: "", photoContent: "",
photoCategory: "", photoProduct: [],
}, },
......
增值产品-小程序及app/nyx-master/app.json
{ {
{ {
"pages": [ "pages": [
"pages/member/activity-post/activity-submit/activity-submit", "pages/activity/activity",
"pages/activity/activity", "pages/member/activity-post/activity-submit/activity-submit",
"pages/activity/activity-list/activity-list", "pages/activity/activity-list/activity-list",
"pages/my/my-members/my-members", "pages/my/my-members/my-members",
"pages/member/activity-post/activity-edit/activity-edit", "pages/member/activity-post/activity-edit/activity-edit",
......
增值产品-小程序及app/nyx-master/config.js
//config.js API全局域名配置 //config.js API全局域名配置
...@@ -42,6 +42,7 @@ var config={ ...@@ -42,6 +42,7 @@ var config={
test_url : host_key + "/api/nyx/match/test", test_url : host_key + "/api/nyx/match/test",
match_add_item_url: host_key + "/api/nyx/match/add/item", match_add_item_url: host_key + "/api/nyx/match/add/item",
user_reg_url: host_key + "/api/nyx/user/reg", user_reg_url: host_key + "/api/nyx/user/reg",
member_reg_url: host_key + "/api/nyx/member/reg",
userinfo_query_url: host_key + "/api/nyx/userinfo/query", userinfo_query_url: host_key + "/api/nyx/userinfo/query",
notes_query_url: host_key + "/api/nyx/post/query", notes_query_url: host_key + "/api/nyx/post/query",
activity_query_url: host_key + "/api/nyx/activity/query", activity_query_url: host_key + "/api/nyx/activity/query",
...@@ -52,10 +53,12 @@ var config={ ...@@ -52,10 +53,12 @@ var config={
match_query_then_update_url: host_key + "/api/nyx/match/queryThenUpdate/id", match_query_then_update_url: host_key + "/api/nyx/match/queryThenUpdate/id",
bonus_query_url: host_key + "/api/nyx/match/bonus/query/id", bonus_query_url: host_key + "/api/nyx/match/bonus/query/id",
collect_query_url: host_key + "/api/nyx/collect/query", collect_query_url: host_key + "/api/nyx/collect/query",
member_query_url: host_key + "/api/nyx/member/query",
socket_url: socket_url, socket_url: socket_url,
oss_token_url: host_key + "/api/nyx/oss/getToken", oss_token_url: host_key + "/api/nyx/oss/getToken",
oss_callback_url: login_url + "/api/nyx/oss/callback", oss_callback_url: login_url + "/api/nyx/oss/callback",
oss_member_callback_url: login_url + "/api/nyx/oss/member/callback", oss_member_callback_url: login_url + "/api/nyx/oss/member/callback",
oss_activity_callback_url: login_url + "/api/nyx/oss/activity/callback",
post_like_url: host_key + "/api/nyx/post/like", post_like_url: host_key + "/api/nyx/post/like",
activity_like_url: host_key + "/api/nyx/activity/like", activity_like_url: host_key + "/api/nyx/activity/like",
activity_like_del_url: host_key + "/api/nyx/activity/like/del", activity_like_del_url: host_key + "/api/nyx/activity/like/del",
......
增值产品-小程序及app/nyx-master/pages/activity/activity.js
// pages/activity/activity.js // pages/activity/activity.js
...@@ -112,6 +112,14 @@ Page({ ...@@ -112,6 +112,14 @@ Page({
} }
else //存在 else //存在
{ {
//初始化数据
_this.setData({
nyxCode: wx.getStorageSync('nyxCode'),
userInfo: wx.getStorageSync('userInfo'),
authStatus: wx.getStorageSync('authStatus'),
members : wx.getStorageSync('members'),
})
//更新用户信息 //更新用户信息
var strUrl = config.userinfo_query_url + "?userid=" + nyxCode var strUrl = config.userinfo_query_url + "?userid=" + nyxCode
wx.setStorageSync('nyxCode', nyxCode); wx.setStorageSync('nyxCode', nyxCode);
...@@ -138,13 +146,14 @@ Page({ ...@@ -138,13 +146,14 @@ Page({
} }
// step3 确定member信息, 写入 data.members // step3 确定member信息, 写入 data.members
var members = wx.getStorageSync('members') || [] // var members = wx.getStorageSync('members') || []
wx.setStorageSync('members', members) // wx.setStorageSync('members', members)
if(members.length > 0) // if(members.length > 0)
{ // {
_this.setData({ members }) // _this.setData({ members })
app.globalData.members = members // app.globalData.members = members
} // }
_this.getMemberInfo(0, 1, 20)
var device = wx.getSystemInfoSync() var device = wx.getSystemInfoSync()
//self.device = app.globalData.myDevice //self.device = app.globalData.myDevice
...@@ -575,44 +584,95 @@ Page({ ...@@ -575,44 +584,95 @@ Page({
// 获取collects数据 // 获取collects数据
// scrollType: 是否是翻页 // scrollType: 是否是翻页
// tips; 该函数是my-collects函数的简略版, 而且是单次运行的 // tips; 该函数是my-collects函数的简略版, 而且是单次运行的
getCollectsStorage: function (scrollType, pageNum, pageCount) { getCollectsStorage: function (scrollType, pageNum, pageCount) {
var _this = this; var _this = this;
var userId = _this.__data__.nyxCode var userId = _this.__data__.nyxCode
var query_url = '&userId=' + userId var query_url = '&userId=' + userId
var strUrl = config.collect_query_url + "?pageCount=" + pageCount var strUrl = config.collect_query_url + "?pageCount=" + pageCount
+ "&pageNum=" + pageNum + query_url + "&pageNum=" + pageNum + query_url
config.debug == 1 ? console.log("===strUrl is: \"" + strUrl + "\"") : "" config.debug == 1 ? console.log("===strUrl is: \"" + strUrl + "\"") : ""
wx.request({ wx.request({
url: strUrl, url: strUrl,
method: 'GET', method: 'GET',
header: { header: {
'Cookie': wx.getStorageSync('cookieKey'), 'Cookie': wx.getStorageSync('cookieKey'),
}, },
success: function (res) { success: function (res) {
if (res.data.resultCode == 200) { if (res.data.resultCode == 200) {
//表示HTTP请求成功 //表示HTTP请求成功
console.log(res.data); console.log(res.data);
// 设置全局的点赞标记 step1 // 设置全局的点赞标记 step1
var likeDictStorage = wx.getStorageSync('likeDictStorage') || {} var likeDictStorage = wx.getStorageSync('likeDictStorage') || {}
for (var i = 0; i < res.data.data.length; i++) { for (var i = 0; i < res.data.data.length; i++) {
var result = {} var result = {}
result["activity_id"] = res.data.data[i].activityId result["activity_id"] = res.data.data[i].activityId
// 设置全局的点赞标记 step2 // 设置全局的点赞标记 step2
likeDictStorage[result["activity_id"]] = 1 likeDictStorage[result["activity_id"]] = 1
}
// 设置全局的点赞标记 step3
wx.setStorageSync('likeDictStorage', likeDictStorage)
} }
}
})
},
// 获取member_user info 数据
// scrollType: 是否是翻页
// tips; 该函数是my-collects函数的简略版, 而且是单次运行的
getMemberInfo: function (scrollType, pageNum, pageCount) {
var _this = this;
var userId = _this.__data__.nyxCode
var query_url = '&userId=' + userId
var strUrl = config.member_query_url + "?pageCount=" + pageCount
+ "&pageNum=" + pageNum + query_url
config.debug == 1 ? console.log("===strUrl is: \"" + strUrl + "\"") : ""
wx.request({
url: strUrl,
method: 'GET',
header: {
'Cookie': wx.getStorageSync('cookieKey'),
},
success: function (res) {
if (res.data.resultCode == 200) {
//表示HTTP请求成功
console.log(res.data);
var members = []
// 设置全局的点赞标记 step3 if(res.data.data.length > 0)
wx.setStorageSync('likeDictStorage', likeDictStorage) {
for (var i = 0; i < res.data.data.length; i++) {
var result = {}
result["member_id"] = res.data.data[i].memberId
result["address_id"] = res.data.data[i].addressId
result["default_member"] = res.data.data[i].defaultMember
result["member_name"] = res.data.data[i].memberName
result["member_address"] = res.data.data[i].addressName
result["member_slogan"] = res.data.data[i].memberSlogan == undefined ? "" : res.data.data[i].memberSlogan
result["member_logo"] = res.data.data[i].memberLogo
members.push(result)
}
}
// 设置
wx.setStorageSync('members', members)
wx.setStorageSync('memberInfo', members[0])
app.globalData.memberInfo = members[0]
app.globalData.members = members
}
} }
} })
}) },
},
......
增值产品-小程序及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
...@@ -25,10 +25,7 @@ Page({ ...@@ -25,10 +25,7 @@ Page({
} }
}) })
var product_listData = [ var product_listData = [{ desc: "", price: 0, stock: 0, }]
{ product_desc: "会员", unit_price: 59.00, stock: 10, },
{ product_desc: "普通用户", unit_price: 99.00, stock: 10, },
]
...@@ -42,6 +39,10 @@ Page({ ...@@ -42,6 +39,10 @@ Page({
// Page Flow // Page Flow
navigateToSubmit() { navigateToSubmit() {
var _this = this;
var product = _this.__data__.product_listData
app.globalData.postData.photoProduct = _this.__data__.product_listData
let promise = app.onCheckText(app.globalData.postData.photoTag) let promise = app.onCheckText(app.globalData.postData.photoTag)
//在本轮event loop（事件循环）运行完成之前，回调函数是不会被调用的 //在本轮event loop（事件循环）运行完成之前，回调函数是不会被调用的
//then后的括号里应该是参数param //then后的括号里应该是参数param
...@@ -57,20 +58,43 @@ Page({ ...@@ -57,20 +58,43 @@ Page({
}, },
// Date Flow // Date Flow
// 输入该组图片的标题
bindKeyTitle(e) {
var _this = this;
_this.setData({
inputTitle: e.detail.value
})
//全局赋值
app.globalData.postData.photoTitle = e.detail.value
},
// 输入该组图片的标签 // 输入该组图片的标签
bindKeyInput(e) { bindKeyTag(e) {
var _this = this; var _this = this;
_this.setData({ _this.setData({
inputValue: e.detail.value inputTag: e.detail.value
}) })
//全局赋值 //全局赋值
app.globalData.postData.photoTag = e.detail.value app.globalData.postData.photoTag = e.detail.value
}, },
bindKeyText(e){
var _this = this;
//js的e.currentTarget.id 对应wxml的 id="0"
//js的e.currentTarget.dataSet.id 对应wxml的 data-id="desc"
var index = e.currentTarget.id;
var key = e.currentTarget.dataset.id
var product_listData = _this.__data__.product_listData
var dict = product_listData[index]
dict[key] = e.detail.value
product_listData.splice(index, 1, dict);
_this.setData({ product_listData })
},
addList: function(){ addList: function(){
var _this = this; var _this = this;
var list = _this.data.product_listData; var list = _this.data.product_listData;
var newData = { product_desc: "会员", unit_price: 59.00, stock: 10, }; var newData = { desc: "", price: 0, stock: 0, };
list.push(newData);//实质是添加lists数组内容，使for循环多一次 list.push(newData);//实质是添加lists数组内容，使for循环多一次
this.setData({ this.setData({
product_listData: list, product_listData: list,
......
增值产品-小程序及app/nyx-master/pages/member/activity-post/activity-edit/activity-edit.wxml
<!-- /page/post/edit/edit 添加分类的标签，以及自定义标签 --> <!-- /page/post/edit/edit 添加分类的标签，以及自定义标签 -->
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<view class="weui-cells weui-cells_after-title"> <view class="weui-cells weui-cells_after-title">
<view class="weui-cell "> <view class="weui-cell ">
<view class="weui-cell__bd"> <view class="weui-cell__bd">
<input class="weui-input" bindinput="bindKeyInput" placeholder="请输入标题" /> <input class="weui-input" bindinput="bindKeyTitle" placeholder="请输入标题" />
</view> </view>
</view> </view>
</view> </view>
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
<view class="weui-cells weui-cells_after-title"> <view class="weui-cells weui-cells_after-title">
<view class="weui-cell "> <view class="weui-cell ">
<view class="weui-cell__bd"> <view class="weui-cell__bd">
<input class="weui-input" bindinput="bindKeyInput" placeholder="请输入标签" /> <input class="weui-input" bindinput="bindKeyTag" placeholder="请输入标签" />
</view> </view>
</view> </view>
</view> </view>
<view class="weui-cells__title">#添加活动内容</view> <view class="weui-cells__title">#添加活动类别</view>
<!-- 添加表格: 序号, 类别描述, 价格, 个数 --> <!-- 添加表格: 序号, 类别描述, 价格, 个数 -->
<view class='table'> <view class='table'>
<view class='table_header'> <view class='table_header'>
...@@ -42,27 +42,29 @@ ...@@ -42,27 +42,29 @@
<block wx:for="{{product_listData}}" wx:for-item="item" wx:key="{{index}}"> <block wx:for="{{product_listData}}" wx:for-item="item" wx:key="{{index}}">
<view class='table_main'> <view class='table_main'>
<!--上午下午晚上 --> <!-- 序号 -->
<view class='td' style='width:70rpx;background-color:white;'> <view class='td' style='width:70rpx;background-color:white;'>
<view class="cell_label centerclass">{{index}}</view> <view class="cell_label centerclass">{{index}}</view>
</view> </view>
<!-- 周一 --> <!-- 类别 -->
<view class='td'> <view class='td'>
<view class='table_Text_last_class'> <view class='table_Text_last_class'>
{{item.product_desc}} <input bindinput="bindKeyText" placeholder="请输入类别" id="{{index}}" data-id="desc" ></input>
</view> </view>
</view> </view>
<!-- 价格 -->
<view class='td'> <view class='td'>
<view class='table_Text_last_class'> <view class='table_Text_last_class'>
{{item.unit_price}} <input bindinput="bindKeyText" placeholder="请输入价格" id="{{index}}" data-id="price" ></input>
</view> </view>
</view> </view>
<!-- 库存 -->
<view class='td'> <view class='td'>
<view class='table_Text_last_class'> <view class='table_Text_last_class'>
{{item.stock}} <input bindinput="bindKeyText" placeholder="请输入库存" id="{{index}}" data-id="stock" ></input>
</view> </view>
</view> </view>
......
增值产品-小程序及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
...@@ -12,12 +12,20 @@ Page({ ...@@ -12,12 +12,20 @@ Page({
nyxCode : "", nyxCode : "",
authStatus : "", authStatus : "",
userInfo : {}, userInfo : {},
members : [], members : [], // 数据固化
logoArray: [], logoArray: [], // logo 临时temp上传
memberInfo: { memberInfo: {}, // member_name/address 临时temp数据
logoUrl : "",
}, /*
//members
member_id
address_id
default_member
member_name
member_address
member_slogan
member_logo
*/
//阿里云 OSS相关参数 //阿里云 OSS相关参数
// accessid: "", // accessid: "",
...@@ -55,6 +63,13 @@ Page({ ...@@ -55,6 +63,13 @@ Page({
}) })
} }
var members = wx.getStorageSync('members')
if(members.length != 0)
{
var logoArray = [ members[0].member_logo ]
_this.setData({ logoArray })
}
}, },
onReady: function (e) { onReady: function (e) {
...@@ -73,6 +88,9 @@ Page({ ...@@ -73,6 +88,9 @@ Page({
var _this = this; var _this = this;
var title = app.globalData.postData.photoTitle var title = app.globalData.postData.photoTitle
var content = app.globalData.postData.photoContent; //获取content 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 // user_id
// member_id // member_id
...@@ -80,26 +98,40 @@ Page({ ...@@ -80,26 +98,40 @@ Page({
// 注册memberInfo并且提交 // 注册memberInfo并且提交
if( app.globalData.members.length == 0 // 说明还不是member, 需要注册 if( app.globalData.members.length == 0 // 说明还不是member, 需要注册
&& app.globalData.memberInfo != {} // 存在memberInfo的信息 && app.globalData.memberInfo != {} // 存在memberInfo的信息, 可没有member_id
) )
{ {
// 注册memberInfo // 注册 memberInfo
let promise_regMember = new Promise(function (resolve, reject) { // setStorage
_this.onRegMember(resolve, reject) if(logoArray.length == 0) // 直接数据库上传
}) {
//todo
promise_regMember.then( _this.onRegMember();
function (value) { }
console.log("===enter promise_regMember then_pass_" + value) else // 通过oss上传
{
}, let promise_regMember = new Promise(function (resolve, reject) {
function (value) { _this.onRegMemberOss(resolve, reject)
console.log("===enter promise_regMember then_failed_" + value) })
});
promise_regMember.then(
function (value) {
console.log("===enter promise_regMember then_pass_" + value)
// 提交活动
// 存入数据库
// 成功之后返回activity页面
_this.releaseOss(title, content);
_this.switchTab()
},
function (value) {
console.log("===enter promise_regMember then_failed_" + value)
});
}
} }
else //直接提交 else //直接提交
{ {
console.log("===直接提交aliyun oss")
// todo jscat 20200815 测试版本不需要限定文本content是否为 "" // todo jscat 20200815 测试版本不需要限定文本content是否为 ""
//if (content != undefined && content != "") { //if (content != undefined && content != "") {
...@@ -116,7 +148,7 @@ Page({ ...@@ -116,7 +148,7 @@ Page({
console.log("===enter promise then_pass_" + value) console.log("===enter promise then_pass_" + value)
//step3, 上传至oss-上传图片 //step3, 上传至oss-上传图片
//_this.releaseOss(title, content); _this.releaseOss(title, content);
_this.switchTab() _this.switchTab()
}, },
...@@ -170,13 +202,48 @@ Page({ ...@@ -170,13 +202,48 @@ Page({
}) })
}, },
//用于oss_promise
oss_promise: function (dir, resolve) {
var _this = this;
console.log("===this is oss");
//token信息
var strUrl = config.oss_token_url + "?tokenName=ios&userName=1234&dirType=" + dir
wx.request({
url: strUrl,
method: 'GET',
header: {
'content-type': 'application/json'
},
success: res => {
if (res.statusCode == 200) {
console.log("=== oss getToken 返回值_", res.data)
var dict = {
accessid: res.data.data.accessid,
policy: res.data.data.policy,
signature: res.data.data.signature,
host: res.data.data.host,
dir: res.data.data.dir,
expire: res.data.data.expire,
securityToken: res.data.data.securityToken,
}
var oss = _this.data.oss
oss[dir] = dict
_this.setData({
oss : oss,
})
resolve("oss load success")
}
}
})
},
//上传照片(阿里云) //上传照片(阿里云)
uploadAli: function (tag, title, content, photoArr) { uploadAli: function (tag, title, content, photoArr, product) {
var _this = this; var _this = this;
console.log("===uploadAli_data_tag: ",tag) console.log("===uploadAli_data_tag: ",tag)
console.log("===uploadAli_data_title: ",title) console.log("===uploadAli_data_title: ",title)
console.log("===uploadAli_data_content: ",content) console.log("===uploadAli_data_content: ",content)
console.log("===uploadAli_data_photoArr: ",photoArr) console.log("===uploadAli_data_photoArr: ",photoArr)
var promise = Promise.all(photoArr.map((pic, index) => { var promise = Promise.all(photoArr.map((pic, index) => {
//pic是多图上传模式中的单张图片 index => 0 : length-1 //pic是多图上传模式中的单张图片 index => 0 : length-1
console.log(pic) console.log(pic)
...@@ -216,11 +283,21 @@ Page({ ...@@ -216,11 +283,21 @@ Page({
} }
//生成最终的文件字符串 file1.jpg::file2.png (数据库解析格式) //生成最终的文件字符串 file1.jpg::file2.png (数据库解析格式)
var image = photoArrsm.join("::") var image = photoArrsm.join("::")
var userId = wx.getStorageSync('nyxCode') var user_id = wx.getStorageSync('nyxCode')
var strUrl = config.oss_callback_url var address_id = app.globalData.memberInfo.address_id
var member_id = app.globalData.memberInfo.member_id
var strUrl = config.oss_activity_callback_url
var strParam = ""
for(var i=0; i<product.length; i++)
{
for(var key in product[i])
{
strParam += "&" + key + "=" + product[i][key]
}
}
var callback_param = { var callback_param = {
'callbackUrl': strUrl, 'callbackUrl': strUrl,
'callbackBody': 'filename=${object}&size=${size}&mimeType=${mimeType}&height=${imageInfo.height}&width=${imageInfo.width}&tag=' + encodeURI(encodeURI(tag)) + '&title=' + encodeURI(encodeURI(title)) + '&content=' + encodeURI(encodeURI(content)) + '&image=' + image + '&userId=' + userId, 'callbackBody': 'filename=${object}&size=${size}&mimeType=${mimeType}&height=${imageInfo.height}&width=${imageInfo.width}&tag=' + encodeURI(encodeURI(tag)) + '&title=' + encodeURI(encodeURI(title)) + '&content=' + encodeURI(encodeURI(content)) + '&image=' + image + '&userId=' + user_id + '&memberId=' + member_id + '&addressId=' + address_id + encodeURI(encodeURI(strParam)),
'callbackBodyType': "application/x-www-form-urlencoded", 'callbackBodyType': "application/x-www-form-urlencoded",
} }
var base64_callback_body = base64.encode(JSON.stringify(callback_param)); var base64_callback_body = base64.encode(JSON.stringify(callback_param));
...@@ -239,11 +316,13 @@ Page({ ...@@ -239,11 +316,13 @@ Page({
success: function (res) { success: function (res) {
console.log("=== index_"+index) console.log("=== index_"+index)
console.log(res) console.log(res)
resolve(res.data); console.log("success to upload file")
_this.switchTab()
//resolve(res.data);
}, },
fail: function (err) { fail: function (err) {
reject(new Error('failed to upload file'));
console.log("fail to upload file") console.log("fail to upload file")
//reject(new Error('failed to upload file'));
}, },
complete: function () { complete: function () {
console.log("complete to upload file"); console.log("complete to upload file");
...@@ -259,19 +338,29 @@ Page({ ...@@ -259,19 +338,29 @@ Page({
console.log("===this is releaseOss"); console.log("===this is releaseOss");
//获取照片数组 //获取照片数组
var photoArr = app.globalData.postData.photoArray; var photoArr = app.globalData.postData.photoArray;
//时间搓 var tag = app.globalData.postData.photoTag
var product = app.globalData.postData.photoProduct
//时间戳
var expire = this.data.oss[config.user_dir].expire; var expire = this.data.oss[config.user_dir].expire;
//获取当前时间搓 //获取当前时间戳
var expireNow = Date.parse(new Date()) / 1000; var expireNow = Date.parse(new Date()) / 1000;
//如果当前时间大于获取的时间 则重新获取oss; //如果当前时间大于获取的时间 则重新获取oss;
if (expire == undefined || expireNow > expire) { if (expire == undefined || expireNow > expire) {
//重新获取oss //重新获取oss, 成功之后执行uploadAli()
_this.oss(config.user_dir); let promise_oss = _this.oss(config.user_dir, resolve);
expire = this.data.oss[config.user_dir].expire;;
}
var tag = app.globalData.postData.photoTag promise_oss.then(
_this.uploadAli(tag, title, content, photoArr) function (value) {
console.log("===enter promise_oss user_dir then_pass")
_this.uploadAli(tag, title, content, photoArr, product)
});
}
else
{
_this.uploadAli(tag, title, content, photoArr, product)
}
}, },
switchTab() { switchTab() {
...@@ -279,7 +368,14 @@ Page({ ...@@ -279,7 +368,14 @@ Page({
app.globalData.switchId = 1 app.globalData.switchId = 1
wx.switchTab({ wx.switchTab({
url: '/pages/activity/activity' url: '/pages/activity/activity',
success: function (e) {
var page = getCurrentPages().pop();
if (page == undefined || page == null) return;
// 更新首页的数据
console.log("===switchTab page", page)
page.onUpdateData();
}
}); });
}, },
...@@ -337,6 +433,10 @@ Page({ ...@@ -337,6 +433,10 @@ Page({
// //
app.globalData.postData.photoContent = e.detail.value app.globalData.postData.photoContent = e.detail.value
}, },
// 添加口号
bindSlogan(e) {
app.globalData.memberInfo.member_slogan = e.detail.value
},
// 添加名称 // 添加名称
bindName(e) { bindName(e) {
app.globalData.memberInfo.member_name = e.detail.value app.globalData.memberInfo.member_name = e.detail.value
...@@ -385,36 +485,81 @@ Page({ ...@@ -385,36 +485,81 @@ Page({
app.globalData.postData.photoArray = newFilePaths; app.globalData.postData.photoArray = newFilePaths;
}, },
// 注册member // 直接注册member
onRegMember(resolve, reject) // todo not finished jscat 20200902
onRegMember(resolve)
{ {
var _this = this; var _this = this;
var member_id = "mid_" + util.wxuuid() var member_id = "mid_" + util.wxuuid()
app.globalData.memberInfo.member_id = member_id app.globalData.memberInfo.member_id = member_id
var member_name = app.globalData.memberInfo.member_name var member_name = app.globalData.memberInfo.member_name
var member_address = app.globalData.memberInfo.member_address var member_address = app.globalData.memberInfo.member_address
var logoArray = _this.__data__.logoArray var member_slogan = app.globalData.memberInfo.member_slogan
var user_id = _this.__data__.nyxCode
console.log("===this is onRegMember"); console.log("===this is onRegMember");
var query_url = '?userId=' + user_id + '&memberId=' + member_id + '&memberName=' + member_name
+ '&memberAddress=' + member_address
+ '&memberSlogan=' + member_slogan
var strUrl = config.member_reg_url + query_url
config.debug == 1 ? console.log("===onRegMember strUrl is: " + strUrl) : ""
wx.request({
url: strUrl,
method: 'GET',
header: {
'Cookie': wx.getStorageSync('cookieKey'),
},
success: function (res) {
if (res.statusCode == 200) {
//表示查询成功
console.log(res.data);
resolve("reg_member success")
}
}
})
},
// 注册member by Oss
onRegMemberOss(resolve, reject)
{
var _this = this;
var member_id = "mid_" + util.wxuuid()
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_slogan = app.globalData.memberInfo.member_slogan
var logoArray = _this.__data__.logoArray
console.log("===this is onRegMemberOss");
//获取照片数组 //获取照片数组
var logoArray = _this.__data__.logoArray var logoArray = _this.__data__.logoArray
//时间搓 //时间戳
var expire = this.data.oss[config.logo_dir].expire; var expire = this.data.oss[config.logo_dir].expire;
//获取当前时间搓 //获取当前时间戳
var expireNow = Date.parse(new Date()) / 1000; var expireNow = Date.parse(new Date()) / 1000;
//如果当前时间大于获取的时间 则重新获取oss; //如果当前时间大于获取的时间 则重新获取oss;
if (expire == undefined || expireNow > expire) { if (expire == undefined || expireNow > expire) {
//重新获取oss //重新获取oss, 成功之后执行uploadMember()
_this.oss(config.logo_dir); let promise_oss = _this.oss(config.logo_dir, resolve);
expire = this.data.oss[config.logo_dir].expire;
}
_this.uploadMember(member_id, member_name, member_address, logoArray, resolve, reject)
promise_oss.then(
function (value) {
console.log("===enter promise_oss then_pass")
_this.uploadMember(member_id, address_id, member_name, member_address, member_slogan, logoArray, resolve, reject)
});
}
else
{
_this.uploadMember(member_id, address_id, member_name, member_address, member_slogan, logoArray, resolve, reject)
}
}, },
//上传商家到(阿里云) //上传商家信息到(阿里云)
uploadMember: function (member_id, member_name, member_address, logoArray, resolve, reject) { uploadMember: function (member_id, address_id, member_name, member_address, member_slogan, logoArray, resolve, reject) {
var _this = this; var _this = this;
var pic = logoArray[0] var pic = logoArray[0]
console.log(pic) console.log(pic)
...@@ -445,12 +590,19 @@ Page({ ...@@ -445,12 +590,19 @@ Page({
//生成最终的文件字符串 file1.jpg //生成最终的文件字符串 file1.jpg
var image = pic.replace('http://tmp/', "").replace('wxfile://', ""); var image = pic.replace('http://tmp/', "").replace('wxfile://', "");
var member_logo = path + image var member_logo = path + image
var user_id = _this.__data__.nyxCode
//设置memberInfo全局函数 //设置memberInfo全局函数
app.globalData.memberInfo.member_logo = member_logo 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
var strUrl = config.oss_member_callback_url var strUrl = config.oss_member_callback_url
var callback_param = { var callback_param = {
'callbackUrl': strUrl, 'callbackUrl': strUrl,
'callbackBody': 'filename=${object}&size=${size}&mimeType=${mimeType}&height=${imageInfo.height}&width=${imageInfo.width}&memberName=' + encodeURI(encodeURI(member_name)) + '&memberAddress=' + encodeURI(encodeURI(member_address)) + '&image=' + member_logo + '&memberId=' + member_id, 'callbackBody': 'filename=${object}&size=${size}&mimeType=${mimeType}&height=${imageInfo.height}&width=${imageInfo.width}&memberName=' + encodeURI(encodeURI(member_name)) + '&memberAddress=' + encodeURI(encodeURI(member_address)) + '&memberSlogan=' + encodeURI(encodeURI(member_slogan)) + '&image=' + member_logo + '&memberId=' + member_id + '&userId=' + user_id + '&addressId=' + address_id,
'callbackBodyType': "application/x-www-form-urlencoded", 'callbackBodyType': "application/x-www-form-urlencoded",
} }
var base64_callback_body = base64.encode(JSON.stringify(callback_param)); var base64_callback_body = base64.encode(JSON.stringify(callback_param));
...@@ -465,6 +617,11 @@ Page({ ...@@ -465,6 +617,11 @@ Page({
'content-type': 'multipart/form-data' 'content-type': 'multipart/form-data'
}, },
success: function (res) { success: function (res) {
// 保存member和memberInfo
wx.setStorageSync("memberInfo", app.globalData.memberInfo)
var members = [app.globalData.memberInfo]
wx.setStorageSync("members", members)
_this.setData({ members })
console.log(res) console.log(res)
resolve(res.data); resolve(res.data);
}, },
......
增值产品-小程序及app/nyx-master/pages/member/activity-post/activity-submit/activity-submit.wxml
<view class="page-body"> <view class="page-body">
...@@ -20,10 +20,6 @@ ...@@ -20,10 +20,6 @@
</view> </view>
<!-- </form> --> <!-- </form> -->
<!-- 企业信息 -->
<!-- <view class="note-row"> -->
<!-- <view class="note-column-left align justify"> -->
<view class="weui-cells"> <view class="weui-cells">
<view class="weui-cell"> <view class="weui-cell">
<view class="weui-cell__bd"> <view class="weui-cell__bd">
...@@ -31,7 +27,15 @@ ...@@ -31,7 +27,15 @@
<view class="weui-uploader__hd"> <view class="weui-uploader__hd">
<view class="weui-uploader__title">商家信息</view> <view class="weui-uploader__title">商家信息</view>
</view> </view>
<!-- 地址 -->
<view class="weui-uploader__hd">
<block wx:if="{{members.length==0}}">
<input class="weui-input" bindinput="bindSlogan" placeholder="请输入口号" />
</block>
<block wx:else>
{{members[0].member_slogan}}
</block>
</view>
<view class="note-row"> <view class="note-row">
<!-- start of column left --> <!-- start of column left -->
...@@ -52,28 +56,38 @@ ...@@ -52,28 +56,38 @@
</view> </view>
</view> </view>
<!-- end of note-column-left --> <!-- end of note-column-left -->
<!-- start of note-column-->
<view class="note-column" style="margin-left: 20rpx;"> <view class="note-column" style="margin-left: 20rpx;">
<view class="weui-cells weui-cells_after-title" style="height: 96rpx"> <view class="weui-cells weui-cells_after-title" style="height: 96rpx">
<view> <view>
<view class="weui-cell__bd"> <view class="weui-cell__bd">
<input class="weui-input" bindinput="bindName" placeholder="请输入名称" /> <block wx:if="{{members.length==0}}">
<input class="weui-input" bindinput="bindName" placeholder="请输入名称" />
</block>
<block wx:else>
{{members[0].member_name}}
</block>
</view> </view>
</view> </view>
</view> </view>
<!-- end of note-column-->
<!-- start of note-column-->
<view class="weui-cells weui-cells_after-title" style="height: 96rpx"> <view class="weui-cells weui-cells_after-title" style="height: 96rpx">
<view> <view>
<view class="weui-cell__bd"> <view class="weui-cell__bd">
<input class="weui-input" bindinput="bindAddress" placeholder="请输入地址" /> <block wx:if="{{members.length==0}}">
<input class="weui-input" bindinput="bindAddress" placeholder="请输入地址" />
</block>
<block wx:else>
{{members[0].member_address}}
</block>
</view> </view>
</view> </view>
</view> </view>
<!-- end of note-column-->
</view>
</view>
</view>
</view>
</view> </view>
</view> </view>
</view> </view>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论