Skip to content

M
mallapp
Commit 46cb8a87 authored by Mac's avatar Mac
Browse files
Options

1

parent c7ef73cb
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 13 deletions
components/auth/index.vue
View file @ 46cb8a87
......@@ -117,6 +117,8 @@
let pid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0;
let Up = uni.getStorageSync("Up") ? uni.getStorageSync("Up").Up : 0;
let SmallShopId = uni.getStorageSync("SmallShopId") ? uni.getStorageSync("SmallShopId").SmallShopId : 0;
let CounponPassword = uni.getStorageSync("CounponPassword") ? uni.getStorageSync("CounponPassword").CounponPassword : 0;
that.request2({
url: '/api/AppletLogin/Login',
data: {
......@@ -128,6 +130,7 @@
SuperiorId: pid,
SmallShopId: SmallShopId,
UserPageType: Up,
CounponPassword:CounponPassword
}
},
res => {
......@@ -142,6 +145,7 @@
uni.removeStorageSync('pid');
uni.removeStorageSync('SmallShopId');
uni.removeStorageSync("Up");
uni.removeStorageSync("CounponPassword");
}
}
);
......
manifest.json
View file @ 46cb8a87
......@@ -55,7 +55,7 @@
"sdkConfigs" : {
"share" : {
"weixin" : {
"appid" : "wx38e054ee42b054f4",
"appid" : "wxacd9f8cc3480d29e",
"UniversalLinks" : ""
}
}
......@@ -66,7 +66,7 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
"appid" : "wx38e054ee42b054f4",
"appid" : "wxacd9f8cc3480d29e",
"setting" : {
"urlCheck" : false,
"minified" : false
......
pages/index/index.vue
View file @ 46cb8a87
......@@ -18,6 +18,7 @@
<u-icon name="arrow-left" size="44"></u-icon>
</view>
</view>
<view @click='yj' style="width: 200px;height: 50px;">意见调查</view>
<u-tabs v-if="myPageData.home_pages && myPageData.home_pages.navs.length > 1" name="name" :list="myPageData.home_pages.navs"
:is-scroll="true" :active-color="mainColor" :current="active" :bar-width="80" :font-size="32" :bold="false" @change="changeHandler"></u-tabs>
<template v-for="(item, i) in myPageData.home_pages.navs">
......@@ -183,9 +184,6 @@
educationteacher
},
onLoad(options) {
uni.navigateTo({
url: '/pages/school/investigation?ID=4' //6未开始 9已填 10 //活动结束 //4未填写
})
let that = this;
uni.getSystemInfo({
success(res) {
......@@ -256,6 +254,12 @@
SmallShopId: options.SmallShopId
});
}
//从其他小程序跳转过来
if (options && options.CounponPassword) {
uni.setStorageSync("CounponPassword", {
CounponPassword: options.CounponPassword
});
}
if (options && options.scene) {
//兼容之前小程序的调转
this.getjump(options.scene);
......@@ -584,6 +588,8 @@
let SmallShopId = uni.getStorageSync("SmallShopId") ?
uni.getStorageSync("SmallShopId").SmallShopId :
0;
let CounponPassword = uni.getStorageSync("CounponPassword") ? uni.getStorageSync("CounponPassword").CounponPassword : 0;
that.request2({
url: "/api/AppletLogin/Login",
data: {
......@@ -595,6 +601,7 @@
SuperiorId: pid,
SmallShopId: SmallShopId,
UserPageType: Up,
CounponPassword:CounponPassword
},
},
(res) => {
......@@ -608,6 +615,7 @@
uni.removeStorageSync("pid");
uni.removeStorageSync("SmallShopId");
uni.removeStorageSync("Up");
uni.removeStorageSync("CounponPassword");
that.getPageType()
if (res.data.IsOpenSchool == 1) { //校园开启
that.init()
......@@ -1084,7 +1092,11 @@
getPickcar(Name) { //选择取消地址
this.$refs.city[0].getPickcar(Name)
},
yj(){
uni.navigateTo({
url: '/pages/school/investigation?ID=4' //6未开始 9已填 10 //活动结束 //4未填写
})
}
},
};
</script>
......
pages/school/investigation.vue
View file @ 46cb8a87
......@@ -81,7 +81,10 @@
</view>
</view>
<view v-if='item.SurveyType==1 || item.SurveyType==2|| item.SurveyType==3'>
<view>{{index+1}}、{{item.Title}}<text class='starsx' v-if="item.IsRequired==1">*</text></view>
<view>{{index+1}}、{{item.Title}}
<text v-if="item.SurveyType==2|| item.SurveyType==3">({{item.SurveyTypeStr}})</text>
<text class='starsx' v-if="item.IsRequired==1">*</text>
</view>
<view class="rowpfright" v-if='item.SurveyType==1'>
<text class="ratestyle" style="margin-right: 10px;margin-left: 0;">评分</text>
<u-rate :current="item.ScoreNum" :active-color="mainColor" inactive-color="#b2b2b2" active-icon="star"
......@@ -95,6 +98,7 @@
<view style="margin: 12px 0;" v-if='item.SurveyType==2|| item.SurveyType==3'>
<u-checkbox-group size='30' :active-color='mainColor'>
<u-checkbox
style='width: 100%;'
shape="circle"
@change="checkboxChange(item.FormType,item.SurveyType,index,y,$event)"
v-model="x.IsCheck==0?false:true"
......@@ -112,7 +116,10 @@
<div class='title' >问卷信息</div>
<view class="cont" v-for="(item,index) in surveyData.SurveyList" :key='index'>
<view >
<view>{{index+1}}、{{item.Title}}<text class='starsx' v-if="item.IsRequired==1">*</text></view>
<view>{{index+1}}、{{item.Title}}
<text v-if="item.SurveyType==2|| item.SurveyType==3">({{item.SurveyTypeStr}})</text>
<text class='starsx' v-if="item.IsRequired==1">*</text>
</view>
<view class="wjright" v-if='item.SurveyType==4'>
<textarea v-model="item.TextContent" placeholder="请输入" style="width: 100%;height: 100%;"/>
</view>
......@@ -130,6 +137,7 @@
<u-checkbox-group size='30' :active-color='mainColor'>
<u-checkbox
shape="circle"
style='width: 100%;'
@change="checkboxChange(item.FormType,item.SurveyType,index,y,$event)"
v-model="x.IsCheck==0?false:true"
v-for="(x, y) in item.SurveyOptionsList" :key="y"
......@@ -322,8 +330,19 @@
}
},
receive(){
receive(){//领取
if(this.surveyData.PrizeType==2){//站外
uni.navigateToMiniProgram({
appId: 'wx38e054ee42b054f4',
path: 'pages/index/index?id=123',
extraData: {
'data1': 'test'
},
success(res) {
// 打开成功
}
})
}
},
goindex(){
uni.redirectTo({ url: "/pages/index/index" });
......
pages/user-center/user-center.vue
View file @ 46cb8a87
......@@ -309,6 +309,8 @@
let pid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0;
let Up = uni.getStorageSync("Up") ? uni.getStorageSync("Up").Up : 0;
let SmallShopId = uni.getStorageSync("SmallShopId") ? uni.getStorageSync("SmallShopId").SmallShopId : 0;
let CounponPassword = uni.getStorageSync("CounponPassword") ? uni.getStorageSync("CounponPassword").CounponPassword : 0;
that.request2({
url: '/api/AppletLogin/Login',
data: {
......@@ -320,6 +322,7 @@
SuperiorId: pid,
SmallShopId: SmallShopId,
UserPageType: Up,
CounponPassword:CounponPassword
}
},
res => {
......
plugin/api.js
View file @ 46cb8a87
......@@ -2,9 +2,9 @@ export default {
install(Vue, options) {
Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285"
// Vue.prototype.host2 = "http://192.168.0.110:8200"
Vue.prototype.host2 = "https://mallApi.oytour.com"
// Vue.prototype.host2 = "https://mallApi.oytour.com"
// Vue.prototype.host2 = "http://192.168.1.5:8088"
// Vue.prototype.host2 = "http://192.168.1.48:8014"
Vue.prototype.host2 = "http://192.168.1.48:8014"
// Vue.prototype.host2 = "http://testmall.oytour.com/"
Vue.prototype.request = function(param, success, failed) {
......@@ -80,6 +80,7 @@ export default {
let pid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0;
let Up = uni.getStorageSync("Up") ? uni.getStorageSync("Up").Up : 0;
let SmallShopId = uni.getStorageSync("SmallShopId") ? uni.getStorageSync("SmallShopId").SmallShopId : 0;
let CounponPassword = uni.getStorageSync("CounponPassword") ? uni.getStorageSync("CounponPassword").CounponPassword : 0;
this.request2({
url: '/api/AppletLogin/Login',
data: {
......@@ -91,6 +92,7 @@ export default {
SuperiorId: pid,
SmallShopId: SmallShopId,
UserPageType: Up,
CounponPassword:CounponPassword
}
},
res => {
......@@ -99,6 +101,7 @@ export default {
uni.removeStorageSync('pid');
uni.removeStorageSync('SmallShopId');
uni.removeStorageSync("Up");
uni.removeStorageSync("CounponPassword");
}
}
);
......@@ -106,7 +109,7 @@ export default {
// 获取小程序APPID
Vue.prototype.GetMiniAppId = function() {
let appObj = {};
let appType = 6;
let appType = 1;
switch (appType) {
case 1: //赞羊
appObj = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment