Compare commits

..

8 Commits
master ... yh

  1. 1
      .gitignore
  2. 4
      .hbuilderx/launch.json
  3. 4
      common/config.js
  4. 55
      common/notifyMsg.js
  5. 8
      manifest.json
  6. 27
      pages.json
  7. 9
      pages/activity/index.vue
  8. 54
      pages/index/addShop.vue
  9. 184
      pages/index/addTask.vue
  10. 291
      pages/index/shopIndex.vue
  11. 2
      pages/member/chongzhi.vue
  12. 99
      pages/my/index.vue
  13. 3
      pages/my/myshop.vue
  14. 2
      pages/my/ranking.vue
  15. 15
      pages/my/toExamine.vue
  16. 53
      pages/my/withdrawal.vue
  17. 8
      pages/public/login.vue
  18. 2
      pages/public/mobile.vue
  19. 69
      project.config.json
  20. BIN
      static/img/home/calendar.png
  21. BIN
      static/img/home/feiji.png
  22. BIN
      static/img/home/money.png
  23. BIN
      static/img/home/title-logo.png
  24. BIN
      static/img/home/xinzeng.png
  25. BIN
      static/img/my/about.png
  26. BIN
      static/img/my/chongzhi.png
  27. BIN
      static/img/my/dianpu.png
  28. BIN
      static/img/my/dingdan.png
  29. BIN
      static/img/my/huodong.png
  30. BIN
      static/img/my/jiaocheng.png
  31. BIN
      static/img/my/lianxikefu.png
  32. BIN
      static/img/my/lishi.png
  33. BIN
      static/img/my/share.png
  34. BIN
      static/img/my/tixian.png
  35. BIN
      static/img/my/yjfk.png
  36. BIN
      static/img/tabbar/activity.png
  37. BIN
      static/img/tabbar/activityselected.png
  38. BIN
      static/img/tabbar/dingdan.png
  39. BIN
      static/img/tabbar/dingdans.png
  40. BIN
      static/img/tabbar/mine.png
  41. BIN
      static/img/tabbar/mines.png
  42. BIN
      static/img/tabbar/shop2.png
  43. BIN
      static/img/tabbar/shopselected.png

1
.gitignore vendored

@ -1,2 +1,3 @@
.idea .idea
unpackage unpackage
node_modules

4
.hbuilderx/launch.json

@ -6,6 +6,10 @@
{ {
"launchtype" : "remote" "launchtype" : "remote"
}, },
"h5" :
{
"launchtype" : "remote"
},
"mp-weixin" : "mp-weixin" :
{ {
"launchtype" : "remote" "launchtype" : "remote"

4
common/config.js

@ -1,4 +1,6 @@
const ROOTPATH1 = "https://shop.canmoujiang.com/sqx_fast"; // const ROOTPATH1 = "http://192.168.0.112:8891/sqx_fast";
const ROOTPATH1 = "http://10.11.32.109:8891/sqx_fast";
// const ROOTPATH1 = "https://fanqie.app.cyjyyjy.com/sqx_fast";
// const ROOTPATH1 = "http://192.168.1.17:8891/sqx_fast"; // const ROOTPATH1 = "http://192.168.1.17:8891/sqx_fast";
const ROOTPATH = "https://shop.canmoujiang.com/sqx_fast"; const ROOTPATH = "https://shop.canmoujiang.com/sqx_fast";
module.exports = { module.exports = {

55
common/notifyMsg.js

@ -0,0 +1,55 @@
export default {
openMsg(){
var that = this
return console.log("test...");
wx.getSetting({
withSubscriptions: true, //是否获取用户订阅消息的订阅状态,默认false不返回
success(ret) {
// console.log(ret,'------------------')
// console.log(Object.keys(ret.subscriptionsSetting.itemSettings).length)
// if (JSON.stringify(ret.subscriptionsSetting.itemSettings).indexOf('accept')!=-1) {
if (ret.subscriptionsSetting.itemSettings) {
uni.setStorageSync('sendtaskMsg', true)
uni.openSetting({ // 打开设置页
success(rea) {
console.log(rea.authSetting)
}
});
} else { // 用户没有点击“总是保持以上,不再询问”则每次都会调起订阅消息
uni.setStorageSync('sendtaskMsg', false)
uni.showModal({
title: '提示',
content: '为了更好的体验,请绑定消息推送',
confirmText: '确定',
cancelText: '取消',
success: function(res) {
if (res.confirm) {
uni.requestSubscribeMessage({
tmplIds: that.arr,
success(re) {
// console.log(re,'**********')
var datas = JSON.stringify(re);
if (datas.indexOf("accept") != -1) {
console.log(re)
}
},
fail: (res) => {
console.log(res)
}
})
that.showModal = false
} else if (res.cancel) {
that.showModal = true
}
}
})
}
}
})
}
}

8
manifest.json

@ -1,5 +1,5 @@
{ {
"name" : "餐谋匠吃货圈", "name" : "番茄商家版",
"appid" : "__UNI__uni_sqx", "appid" : "__UNI__uni_sqx",
"description" : "", "description" : "",
"versionName" : "1.0.6", "versionName" : "1.0.6",
@ -135,9 +135,9 @@
"quickapp" : {}, "quickapp" : {},
/* */ /* */
"mp-weixin" : { "mp-weixin" : {
"appid" : "wxdcb523b59202e3bf", "appid" : "wx00b9154f935c83a3",
"setting" : { "setting" : {
"urlCheck" : false, "urlCheck" : true,
"es6" : true "es6" : true
}, },
"plugins" : { "plugins" : {
@ -148,7 +148,7 @@
}, },
"permission" : { "permission" : {
"scope.userLocation" : { "scope.userLocation" : {
"desc" : "你的位置信息将用于小程序位置接口的效果展示" "desc" : "获取您当前位置进行定位操作"
} }
} }
}, },

27
pages.json

@ -6,7 +6,7 @@
"path": "pages/index/shopIndex", "path": "pages/index/shopIndex",
"style": { "style": {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarTitleText": "商版", "navigationBarTitleText": "商版",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
@ -152,8 +152,9 @@
{ {
"path": "pages/my/index", "path": "pages/my/index",
"style": { "style": {
"navigationStyle": "custom", "enablePullDownRefresh": false,
"enablePullDownRefresh": false "navigationBarTitleText": "我的",
"navigationBarTextStyle": "black"
} }
}, },
{ {
@ -515,25 +516,31 @@
}, },
"tabBar": { "tabBar": {
"color": "#B3B3B3", "color": "#B3B3B3",
"selectedColor": "#FF3530", "selectedColor": "#FF4848",
"borderStyle": "black", "borderStyle": "black",
"backgroundColor": "#ffffff", "backgroundColor": "#ffffff",
"list": [{ "list": [{
"pagePath": "pages/index/shopIndex", "pagePath": "pages/index/shopIndex",
"iconPath": "static/img/tabbar/shop.png", "iconPath": "static/img/tabbar/shop2.png",
"selectedIconPath": "static/img/tabbar/shop1.png", "selectedIconPath": "static/img/tabbar/shopselected.png",
"text": "店铺" "text": "店铺"
}, },
{
"pagePath": "pages/my/toExamine",
"iconPath": "static/img/tabbar/dingdan.png",
"selectedIconPath": "static/img/tabbar/dingdans.png",
"text": "订单"
},
{ {
"pagePath": "pages/activity/index", "pagePath": "pages/activity/index",
"iconPath": "static/img/tabbar/actives.png", "iconPath": "./static/img/tabbar/activity.png",
"selectedIconPath": "static/img/tabbar/actives1.png", "selectedIconPath": "static/img/tabbar/activityselected.png",
"text": "活动" "text": "活动"
}, },
{ {
"pagePath": "pages/my/index", "pagePath": "pages/my/index",
"iconPath": "static/img/tabbar/my.png", "iconPath": "static/img/tabbar/mine.png",
"selectedIconPath": "static/img/tabbar/my1.png", "selectedIconPath": "static/img/tabbar/mines.png",
"text": "我的" "text": "我的"
} }
] ]

9
pages/activity/index.vue

@ -3,7 +3,7 @@
<view class="header"> <view class="header">
<view class="shopName"> <view class="shopName">
<!-- <view class="" @tap="shopBtn()">小曲奇的店铺 <image class="icons" src="../../static/img/home/down.png" mode="widthFix"></image></view> --> <!-- <view class="" @tap="shopBtn()">小曲奇的店铺 <image class="icons" src="../../static/img/home/down.png" mode="widthFix"></image></view> -->
<u-dropdown :active-color="colors" title-size='34' style="position: absolute;width: 93%;"> <u-dropdown :active-color="colors" title-size='34' style="position: absolute;width: 70%;left: 35rpx;top:15px">
<u-dropdown-item v-model="value1" height='600rpx' :title="title" :options="options1" <u-dropdown-item v-model="value1" height='600rpx' :title="title" :options="options1"
@change="changes"> @change="changes">
</u-dropdown-item> </u-dropdown-item>
@ -20,7 +20,7 @@
</view> --> </view> -->
</view> </view>
<view class="header_Right" @tap="release(0)"> <view class="header_Right" @tap="release(0)">
<image class="showaddImg" src="../../static/img/home/fabu.png"></image> <image class="showaddImg" src="../../static/img/home/feiji.png"></image>
<view class="showAdd">发布活动</view> <view class="showAdd">发布活动</view>
</view> </view>
</view> </view>
@ -50,7 +50,7 @@
}, },
data() { data() {
return { return {
merchantLogo: '../../static/img/logo.jpg', merchantLogo: 'https://download.cyjyyjy.com/fq-logo.jpg',
colors: '#FF4701', colors: '#FF4701',
title: '暂无店铺', title: '暂无店铺',
merchantId: 0, merchantId: 0,
@ -60,8 +60,6 @@
name: '今日活动' name: '今日活动'
}, { }, {
name: '待发布活动' name: '待发布活动'
}, {
name: '历史活动'
}, { }, {
name: '发布记录' name: '发布记录'
}], }],
@ -232,6 +230,7 @@
font-size: 36rpx; font-size: 36rpx;
font-weight: 600; font-weight: 600;
.icons { .icons {
width: 30rpx; width: 30rpx;
margin-left: 10rpx; margin-left: 10rpx;

54
pages/index/addShop.vue

@ -65,6 +65,7 @@
<script> <script>
import shmilyDragImage from '@/components/shmily-drag-image/shmily-drag-image.vue' import shmilyDragImage from '@/components/shmily-drag-image/shmily-drag-image.vue'
import notifyMsg from "@/common/notifyMsg.js"
var QQMapWX = require('@/js_sdk/qqmap-wx-jssdk1.2/qqmap-wx-jssdk.js'); var QQMapWX = require('@/js_sdk/qqmap-wx-jssdk1.2/qqmap-wx-jssdk.js');
var qqmapsdk; var qqmapsdk;
export default { export default {
@ -167,65 +168,18 @@
this.getUserInfo(userId); this.getUserInfo(userId);
// //
if (this.showModal) { if (this.showModal) {
this.openMsg() notifyMsg.openMsg();
} }
} }
}, },
methods: { methods: {
// //
openMsg() {
var that = this
wx.getSetting({
withSubscriptions: true, //false
success(ret) {
// console.log(ret,'------------------')
// console.log(Object.keys(ret.subscriptionsSetting.itemSettings).length)
// if (JSON.stringify(ret.subscriptionsSetting.itemSettings).indexOf('accept')!=-1) {
if (ret.subscriptionsSetting.itemSettings) {
uni.setStorageSync('sendshopMsg', true)
uni.openSetting({ //
success(rea) {
console.log(rea.authSetting)
}
});
} else { //
uni.setStorageSync('sendshopMsg', false)
uni.showModal({
title: '提示',
content: '为了更好的体验,请绑定消息推送',
confirmText: '确定',
cancelText: '取消',
success: function(res) {
if (res.confirm) {
uni.requestSubscribeMessage({
tmplIds: that.arr,
success(re) {
// console.log(re,'**********')
var datas = JSON.stringify(re);
if (datas.indexOf("accept") != -1) {
console.log(re)
}
},
fail: (res) => {
console.log(res)
}
})
that.showModal = false
} else if (res.cancel) {
that.showModal = true
}
}
})
}
}
})
},
getUserInfo(userId) { getUserInfo(userId) {
this.$Request.postT("/app/selectUserById?userId=" + userId).then(res => { this.$Request.postT("/app/selectUserById?userId=" + userId).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.myphone = res.data.phone; this.myphone = res.data.phone;
this.$queue.setData("avatar", res.data.imageUrl ? res.data.imageUrl : this.$queue.setData("avatar", res.data.imageUrl ? res.data.imageUrl :
'/static/img/logo.jpg'); 'https://download.cyjyyjy.com/fq-logo.jpg');
this.$queue.setData("nickName", res.data.nickName ? res.data.nickName : res.data.phone); this.$queue.setData("nickName", res.data.nickName ? res.data.nickName : res.data.phone);
this.$queue.setData("mobile", res.data.phone); this.$queue.setData("mobile", res.data.phone);
this.$queue.setData("invitationCode", res.data.invitationCode); this.$queue.setData("invitationCode", res.data.invitationCode);
@ -539,7 +493,7 @@
} }
.qr { .qr {
background: #FF4701; background: #FF2B2B;
} }
} }

184
pages/index/addTask.vue

@ -35,12 +35,47 @@
<!-- <input type="digit" v-model="money" class="input" maxlength="9" :placeholder="jineplaceName" /> --> <!-- <input type="digit" v-model="money" class="input" maxlength="9" :placeholder="jineplaceName" /> -->
</view> </view>
</view> </view>
<view class="order-des"> <!-- <view class="order-des">
<view class="title">返现金额(每单)</view> <view class="title">返现金额(每单)</view>
<view class="textarea-wrap"> <view class="textarea-wrap">
<input type="digit" v-model="money" class="input" maxlength="9" :placeholder="jineplaceName" /> <input type="digit" v-model="merchantMoney" class="input" maxlength="9" :placeholder="jineplaceName" />
</view>
</view> -->
<view class="order-des">
<view class="title">满返金额</view>
<view class="textarea-wrap special-box">
<text></text>
<input type="digit" v-model="memberPrice" class="input" maxlength="9" placeholder="请输入金额要求" />
<text></text>
<input type="digit" v-model="merchantMoney" class="input" maxlength="9" :placeholder="jineplaceName" />
</view>
</view>
<!-- <view class="order-des">
<view class="title">会员满返</view>
<view class="textarea-wrap special-box">
<text></text>
<input type="digit" v-model="memberPrice" class="input" maxlength="9" placeholder="请输入金额要求" />
<text></text>
<input type="digit" v-model="memberMoney" class="input" maxlength="9" placeholder="请输入优惠金额" />
</view> </view>
</view> </view>
<view class="order-des">
<view class="title">普通用户满返</view>
<view class="textarea-wrap special-box">
<text></text>
<input type="digit" v-model="price" class="input" maxlength="9" placeholder="请输入金额要求" />
<text></text>
<input type="digit" v-model="money" class="input" maxlength="9" placeholder="请输入优惠金额" />
</view>
</view> -->
<view class="order-des">
<view class="title">任务分类</view>
<checkbox-group @change="fromTypeChange" v-model="fromType">
<label v-for="item in fromTypeList" :key="item.id" style="font-size: 24rpx;">
<checkbox :value="item.id" :checked="fromType.includes(item.id+'')" /><text>{{item.name}}</text>
</label>
</checkbox-group>
</view>
<view class="order-des"> <view class="order-des">
<view class="title">接单数量(每日)</view> <view class="title">接单数量(每日)</view>
<view class="textarea-wrap"> <view class="textarea-wrap">
@ -142,7 +177,11 @@
startingTime: '', startingTime: '',
closingTime: '', closingTime: '',
merchantId: 0, merchantId: 0,
merchantMoney:'',
money: '', money: '',
price: '',
memberMoney: '',
memberPrice: '',
orderId: '', //ID orderId: '', //ID
show: false, show: false,
show1: false, show1: false,
@ -164,6 +203,9 @@
name: '美团' name: '美团'
} }
], ],
showPlatform: false,
fromTypeList:[],
fromType: [],
params: { params: {
year: true, year: true,
month: true, month: true,
@ -188,6 +230,19 @@
this.checkMerchant(); this.checkMerchant();
let that = this; let that = this;
//
that.$Request.getT('/helpClassify/selectClassifyList').then(res => {
if (res.code == 0) {
this.fromTypeList = res.data.filter(item=> {
if(item.state == 1){
item.name = item.classifyName
item.value = item.id
return item
}
})
}
});
that.$Request.getT('/common/type/149').then(res => { that.$Request.getT('/common/type/149').then(res => {
if (res.code == 0) { if (res.code == 0) {
if (res.data && res.data.value) { if (res.data && res.data.value) {
@ -243,51 +298,10 @@
methods: { methods: {
// //
openMsg() { openMsg() {
var that = this
wx.getSetting({
withSubscriptions: true, //false
success(ret) {
// console.log(ret,'------------------')
// console.log(Object.keys(ret.subscriptionsSetting.itemSettings).length)
// if (JSON.stringify(ret.subscriptionsSetting.itemSettings).indexOf('accept')!=-1) {
if (ret.subscriptionsSetting.itemSettings) {
uni.setStorageSync('sendtaskMsg', true)
uni.openSetting({ //
success(rea) {
console.log(rea.authSetting)
}
});
} else { //
uni.setStorageSync('sendtaskMsg', false)
uni.showModal({
title: '提示',
content: '为了更好的体验,请绑定消息推送',
confirmText: '确定',
cancelText: '取消',
success: function(res) {
if (res.confirm) {
uni.requestSubscribeMessage({
tmplIds: that.arr,
success(re) {
// console.log(re,'**********')
var datas = JSON.stringify(re);
if (datas.indexOf("accept") != -1) {
console.log(re)
}
}, },
fail: (res) => { fromTypeChange(e){
console.log(res) this.fromType = e.detail.value
}
})
that.showModal = false
} else if (res.cancel) {
that.showModal = true
}
}
})
}
}
})
}, },
checkMerchant() { checkMerchant() {
let userId = this.$queue.getData('userId'); let userId = this.$queue.getData('userId');
@ -302,10 +316,13 @@
if (res.code == 0) { if (res.code == 0) {
this.merchantId = res.data.merchantId; this.merchantId = res.data.merchantId;
this.title = res.data.goodsTitle; this.title = res.data.goodsTitle;
this.money = res.data.merchantMoney; this.merchantMoney = res.data.merchantMoney;
this.money = res.data.money;
this.price = res.data.price;
this.memberPrice = res.data.memberPrice;
this.memberMoney = res.data.memberMoney;
this.serviceMoney = res.data.serviceMoney ? res.data.serviceMoney : 0; this.serviceMoney = res.data.serviceMoney ? res.data.serviceMoney : 0;
this.WeeklyNum = res.data.numStar; this.WeeklyNum = res.data.numStar;
this.upImageNum = res.data.numImg; this.upImageNum = res.data.numImg;
this.commentNum = res.data.numWord; this.commentNum = res.data.numWord;
@ -315,8 +332,6 @@
this.pingjiaName = this.pingjialist[0].name; this.pingjiaName = this.pingjialist[0].name;
} }
this.DistributionNum = res.data.scope; this.DistributionNum = res.data.scope;
this.ReceivingNum = res.data.sumNum; this.ReceivingNum = res.data.sumNum;
this.startTime = res.data.startTime; this.startTime = res.data.startTime;
@ -324,7 +339,8 @@
this.imageList.push(res.data.titleImg); this.imageList.push(res.data.titleImg);
this.platform = res.data.classify == 1 ? '饿了么' : '美团'; this.platform = res.data.classify == 1 ? '饿了么' : '美团';
this.platformId = res.data.classify; this.platformId = res.data.classify;
this.fromType = res.data.activityIds.split(','); //
console.log(this.fromType)
// let asd = res.data.startTime.substring(0,10).replace(/-/g,"") // let asd = res.data.startTime.substring(0,10).replace(/-/g,"")
// console.log(res.data.startTime.substring(0,10).replace(/-/g,"")) // console.log(res.data.startTime.substring(0,10).replace(/-/g,""))
// console.log(res.data.endTime.substring(0,10).replace(/-/g,"")) // console.log(res.data.endTime.substring(0,10).replace(/-/g,""))
@ -414,18 +430,46 @@
return; return;
} }
if (this.money == '') { if (this.memberPrice == '') {
uni.hideLoading();
this.$queue.showToast('请输入满足金额');
return;
}
// if (this.memberMoney == '') {
// uni.hideLoading();
// this.$queue.showToast('');
// return;
// }
// if (this.price == '') {
// uni.hideLoading();
// this.$queue.showToast('');
// return;
// }
// if (this.money == '') {
// uni.hideLoading();
// this.$queue.showToast('');
// return;
// }
if (this.merchantMoney == '') {
uni.hideLoading(); uni.hideLoading();
this.$queue.showToast('请输入返现金额'); this.$queue.showToast('请输入返现金额');
return; return;
} }
if (this.money < this.zuidi) { if (this.merchantMoney < this.zuidi) {
uni.hideLoading(); uni.hideLoading();
this.$queue.showToast('每单最低返现金额为' + this.zuidi + '元'); this.$queue.showToast('每单最低返现金额为' + this.zuidi + '元');
return; return;
} }
if(this.fromType.length == 0){
uni.hideLoading();
this.$queue.showToast('请选择任务分类');
return;
}
if (this.ReceivingNum == '') { if (this.ReceivingNum == '') {
uni.hideLoading(); uni.hideLoading();
this.$queue.showToast('请输入接单数量!'); this.$queue.showToast('请输入接单数量!');
@ -454,6 +498,11 @@
'userId': userId, 'userId': userId,
'merchantId': this.merchantId, 'merchantId': this.merchantId,
'goodsTitle': this.title, 'goodsTitle': this.title,
money: this.money,
price: this.memberPrice,
memberMoney: this.memberMoney,
memberPrice: this.memberPrice,
activityIds: this.fromType.toString(),
// 'titleImg': images, // 'titleImg': images,
// 'img': images1, // 'img': images1,
'sumNum': this.ReceivingNum, 'sumNum': this.ReceivingNum,
@ -461,7 +510,7 @@
'endTime': this.endTime + ' ' + '23:59:59', 'endTime': this.endTime + ' ' + '23:59:59',
'classify': this.platformId, 'classify': this.platformId,
// 'typeId': this.pinleiId, // 'typeId': this.pinleiId,
"merchantMoney": this.money, "merchantMoney": this.merchantMoney,
"numImg": this.upImageNum, "numImg": this.upImageNum,
"numStar": this.WeeklyNum, "numStar": this.WeeklyNum,
"numWord": this.commentNum, "numWord": this.commentNum,
@ -471,11 +520,11 @@
} }
uni.hideLoading(); uni.hideLoading();
// let shijiancha = this.DateDiff(this.startTime, this.endTime); // let shijiancha = this.DateDiff(this.startTime, this.endTime);
let zongjine = this.money * this.ReceivingNum * this.sjcNumber; let zongjine = this.merchantMoney * this.ReceivingNum * this.sjcNumber;
let urlContent = '您发布活动的时间期限为' + this.sjcNumber + '天,发布总金额' + zongjine + '元,并且活动一经发布,不可取消!'; let urlContent = '您发布活动的时间期限为' + this.sjcNumber + '天,发布总金额' + zongjine + '元,并且活动一经发布,不可取消!';
if (this.serviceMoney != 0) { if (this.serviceMoney != 0) {
// zongjine = zongjine + fuwufei; // zongjine = zongjine + fuwufei;
let fuwufei = (this.serviceMoney * this.ReceivingNum * this.sjcNumber) + (this.money * this.ReceivingNum * let fuwufei = (this.serviceMoney * this.ReceivingNum * this.sjcNumber) + (this.merchantMoney * this.ReceivingNum *
this.sjcNumber); this.sjcNumber);
urlContent = '您发布活动的时间期限为' + this.sjcNumber + '天,发布总金额' + fuwufei + '元,(含' + this.serviceMoney + urlContent = '您发布活动的时间期限为' + this.sjcNumber + '天,发布总金额' + fuwufei + '元,(含' + this.serviceMoney +
'元每单服务费)并且活动一经发布,不可取消!'; '元每单服务费)并且活动一经发布,不可取消!';
@ -681,6 +730,17 @@
page { page {
width: 100%; width: 100%;
} }
checkbox .wx-checkbox-input {
transform: scale(0.7);
// border-radius: 50% !important;
/* color: #ffffff !important; */
}
checkbox .wx-checkbox-input.wx-checkbox-input-checked {
color: #fff;
background: #FF4701!important;
border-color: #FF4701 !important;
}
.container { .container {
width: 100%; width: 100%;
@ -728,6 +788,17 @@
margin-top: 10upx; margin-top: 10upx;
} }
} }
.special-box{
display: flex;
align-items: center;
text{
color: #FF4701;
}
input{
width: 40%;
margin-left: 6rpx;
}
}
.order-list { .order-list {
margin-top: 20upx; margin-top: 20upx;
@ -770,7 +841,6 @@
border-bottom: 0; border-bottom: 0;
} }
} }
} }
.btns { .btns {

291
pages/index/shopIndex.vue

@ -2,7 +2,7 @@
<view class="container"> <view class="container">
<view class="header"> <view class="header">
<view class="shopName"> <view class="shopName">
<u-dropdown :active-color="colors" title-size='34' style="position: absolute;width: 93%;"> <u-dropdown :active-color="colors" title-size='34' style="position: absolute;width: 70%;left:35rpx;top:30rpx">
<u-dropdown-item v-model="value1" height='600rpx' :title="title" :options="options1" <u-dropdown-item v-model="value1" height='600rpx' :title="title" :options="options1"
@change="changes"> @change="changes">
</u-dropdown-item> </u-dropdown-item>
@ -12,12 +12,11 @@
<view class="header_Left"> <view class="header_Left">
<view class="left_top"> <view class="left_top">
<image class="logo" :src="merchantLogo"></image> <image class="logo" :src="merchantLogo"></image>
</view> </view>
<view class="left_down"> <view class="left_down">
<image class="icons1" src="../../static/img/home/datas.png"></image> <image class="icons1" src="../../static/img/home/calendar.png"></image>
<view class="times"><span @tap="times(1)" style="text-decoration:underline">{{startTime}} <view class="times"><span @tap="times(1)" >{{startTime}}
</span><span @tap="times(2)" style="text-decoration:underline">{{endTime}}</span></view> </span><span @tap="times(2)" >{{endTime}}</span></view>
<u-picker mode="time" v-model="show1" title="开始时间" @confirm="times1()" :params="params"> <u-picker mode="time" v-model="show1" title="开始时间" @confirm="times1()" :params="params">
</u-picker> </u-picker>
<u-picker mode="time" v-model="show2" title="截止时间" @confirm="times2()" :params="params"> <u-picker mode="time" v-model="show2" title="截止时间" @confirm="times2()" :params="params">
@ -25,29 +24,47 @@
</view> </view>
</view> </view>
<view class="header_Right" @tap="release()"> <view class="header_Right" @tap="release()">
<image class="showaddImg" src="../../static/img/home/shop.png"></image> <image class="showaddImg" src="../../static/img/home/xinzeng.png"></image>
<view class="showAdd">新增店铺</view> <view class="showAdd">+新增店铺</view>
</view> </view>
</view> </view>
<view class="home-bgi"> <view class="home-bgi">
<swiper class="swiper" autoplay="1500" :indicator-dots="true" :circular='true' <view style="display: flex;">
indicator-active-color="#ffffff" indicator-color="#cccccc"> <view class="top">
<swiper-item class="swiper-wrap" v-for="(item,index) in banners" :key='index' <view style="font-size: 12px;">报名数量</view>
@tap="toGoodsInfo(item.url)"> <view style="font-size: 24px;margin-top: 5px;">{{baoMingCount}}</view>
<image :src="item.imageUrl"></image> </view>
</swiper-item> <view class="picture">
</swiper> <image src="../../static/img/home/money.png" style="width: 128px;height: 104.09px;"></image>
</view>
</view>
<view style="display: flex;color: #FFFFFF;" class="bottom">
<view class="item">
<view style="margin-bottom: 5px;">提交任务数</view>
<view>0</view>
</view>
<view class="item">
<view style="margin-bottom: 5px;">审核通过订单</view>
<view>{{shenHeCount}}</view>
</view>
<view class="item">
<view style="margin-bottom: 5px;">返利金额</view>
<view>{{fanLiMoney}}</view>
</view>
</view>
</view> </view>
<view class="header_cont"> <view class="header_cont">
<view class="title">订单查询</view>
<view class="line"></view>
<view class="header_datas" v-for="(item,index) in headerData" :key="index"> <view class="header_datas" v-for="(item,index) in headerData" :key="index">
<view class="numbers">{{item.num}}</view> <view class="numbers">{{item.num}}</view>
<view class="shuoming">{{item.name}}</view> <view class="shuoming">{{item.name}}</view>
</view> </view>
</view> </view>
</view> </view>
<view class="conters"> <!-- <view class="conters">
<view class="title">活动数据</view> <view class="title">活动数据</view>
<view class="dosj"> <view class="dosj">
<view class="dosj_cont" v-for="(item,index) in activityData" :key="index"> <view class="dosj_cont" v-for="(item,index) in activityData" :key="index">
@ -62,7 +79,7 @@
<view class="hdsj">{{item.num}}</view> <view class="hdsj">{{item.num}}</view>
<view class="hdsj_sm">{{item.name}}</view> <view class="hdsj_sm">{{item.name}}</view>
</view> --> </view> -->
<view v-for="(item,index) in zhangdanData" :key="index" @tap="goOrder"> <!-- <view v-for="(item,index) in zhangdanData" :key="index" @tap="goOrder">
<view style="display: flex;width: 100%;padding: 30rpx;align-content: center;"> <view style="display: flex;width: 100%;padding: 30rpx;align-content: center;">
<view style="width: 45%;text-align: left;"> <view style="width: 45%;text-align: left;">
<view class="hdsj">{{item.name}}</view> <view class="hdsj">{{item.name}}</view>
@ -77,19 +94,19 @@
</view> </view>
</view> </view>
</view> </view>
</view> -->
<view class="shop-list-box" v-if="options1.length > 0">
<view class="title">
<image src="@/static/img/home/title-logo.png"></image>
<text>店铺管理</text>
</view> </view>
<view style="margin-top: 40rpx;" v-if="options1.length > 0"> <view class="shop-item" v-for="(item,index) in options1">
<view class="title">店铺管理</view>
<view class="shopList" v-for="(item,index) in options1">
<view class="shopManagement">
<image class="shopLoge" :src="item.merchantLogo"></image> <image class="shopLoge" :src="item.merchantLogo"></image>
<view class="shop_r"> <view class="shop_r">
<view class="shop_name">{{item.merchantName}}</view> <view class="shop_name">{{item.merchantName}}</view>
<view class="shuoDz"> <view class="shuoDz">
<image class="dizhiIcon" src="../../static/img/home/dizhi.png" <image class="dizhiIcon" src="../../static/img/home/dizhi.png"></image>
style="width: 28rpx;padding-right: 10rpx;" mode="widthFix"></image> <text>{{item.merchantAddress}}</text>
<span>{{item.merchantAddress}}</span>
</view>
</view> </view>
</view> </view>
</view> </view>
@ -101,6 +118,7 @@
<script> <script>
import RenDropdownFilter from '@/components/ren-dropdown-filter/ren-dropdown-filter.vue' import RenDropdownFilter from '@/components/ren-dropdown-filter/ren-dropdown-filter.vue'
import wPicker from "@/components/w-picker/w-picker.vue"; import wPicker from "@/components/w-picker/w-picker.vue";
import notifyMsg from "@/common/notifyMsg.js"
export default { export default {
components: { components: {
wPicker, wPicker,
@ -109,17 +127,25 @@
data() { data() {
return { return {
colors: '#FF4701', colors: '#FF4701',
merchantLogo: '../../static/img/logo.jpg', merchantLogo: 'https://download.cyjyyjy.com/fq-logo.jpg',
baoMingCount: 0, //
shenHeCount: 0, //
fanLiMoney: 0, //
merchantId: 0, merchantId: 0,
startDate: 0, startDate: 0,
endDate: 0, endDate: 0,
title: '暂无店铺', title: '暂无店铺',
headerData: [{ headerData: [{
name: '返利金额', //fanLiMoney name: '今日预估金额', //fanLiMoney
num: 0 num: 0
}, },
{ {
name: '审核通过订单', //shenHeCount name: '已出订单', //shenHeCount
num: 0
},
{
name: '未出订单', //shenHeCount
num: 0 num: 0
} }
], ],
@ -180,6 +206,7 @@
} }
}, },
onLoad(e) { onLoad(e) {
console.log( new Date())
let that = this; let that = this;
this.startDate = parseInt(new Date().toISOString().slice(0, 10).replace(/-/g, "")); this.startDate = parseInt(new Date().toISOString().slice(0, 10).replace(/-/g, ""));
// 210 // 210
@ -227,60 +254,12 @@
this.getShopList(userId); this.getShopList(userId);
// //
if (this.showModal) { if (this.showModal) {
this.openMsg() notifyMsg.openMsg();
} }
} }
this.getBannerList(); this.getBannerList();
}, },
methods: { methods: {
//
openMsg() {
var that = this
wx.getSetting({
withSubscriptions: true, //false
success(ret) {
// console.log(ret,'------------------')
// console.log(Object.keys(ret.subscriptionsSetting.itemSettings).length)
// if (JSON.stringify(ret.subscriptionsSetting.itemSettings).indexOf('accept')!=-1) {
if (ret.subscriptionsSetting.itemSettings) {
uni.setStorageSync('sendindexMsg', true)
uni.openSetting({ //
success(rea) {
console.log(rea.authSetting)
}
});
} else { //
uni.setStorageSync('sendindexMsg', false)
uni.showModal({
title: '提示',
content: '为了更好的体验,请绑定消息推送',
confirmText: '确定',
cancelText: '取消',
success: function(res) {
if (res.confirm) {
uni.requestSubscribeMessage({
tmplIds: that.arr,
success(re) {
// console.log(re,'**********')
var datas = JSON.stringify(re);
if (datas.indexOf("accept") != -1) {
console.log(re)
}
},
fail: (res) => {
console.log(res)
}
})
that.showModal = false
} else if (res.cancel) {
that.showModal = true
}
}
})
}
}
})
},
getBannerList() { getBannerList() {
this.$Request.getT('/banner/selectBannerList?state=-1&classify=7').then(res => { this.$Request.getT('/banner/selectBannerList?state=-1&classify=7').then(res => {
if (res.code === 0) { if (res.code === 0) {
@ -374,11 +353,15 @@
this.zhangdanData[0].num = res.dayMoney ? res.dayMoney : 0; this.zhangdanData[0].num = res.dayMoney ? res.dayMoney : 0;
this.zhangdanData[1].num = res.yiMoney ? res.yiMoney : 0; this.zhangdanData[1].num = res.yiMoney ? res.yiMoney : 0;
this.zhangdanData[2].num = res.weiMoney ? res.weiMoney : 0; this.zhangdanData[2].num = res.weiMoney ? res.weiMoney : 0;
this.baoMingCount = res.baoMingCount
this.fanLiMoney = res.fanLiMoney
this.shenHeCount = res.shenHeCount
} }
}); });
}, },
getShopList(userId) { getShopList(userId) {
this.$Request.getT('/goodsMerchant/selectGoodsMerchantPage?page=' + this.page + '&limit=' + this.limit + this.$Request.getT('/goodsMerchant/selectGoodsMerchantList?page=' + this.page + '&limit=' + this.limit +
'&userId=' + userId + '&status=2').then(res => { '&userId=' + userId + '&status=2').then(res => {
if (res.code == 0) { if (res.code == 0) {
if (res.data.records.length > 0) { if (res.data.records.length > 0) {
@ -501,7 +484,33 @@
.home-bgi { .home-bgi {
width: 100%; width: 100%;
height: 260rpx; height: 260rpx;
background: #FFF; background: linear-gradient(48deg, #FF5656 0%, #FF9F74 100%);
opacity: 1;
border-radius: 8px;
.top{
margin-top: 10px;
margin-left: 10px;
color: #FFFFFF;
}
.picture{
position: absolute;
top:45px;
right:20px;
}
.bottom{
margin-left: 10px;
color: #FFFFFF;
font-size: 14px;
margin-top: 20px;
.item{
width: 33%;
}
}
.swiper { .swiper {
width: 100%; width: 100%;
@ -534,7 +543,7 @@
.container { .container {
.header { .header {
width: 100%; width: 100%;
background: #FFFFFF; background:#F5F5F5;
padding: 30rpx; padding: 30rpx;
.header_Left { .header_Left {
@ -589,39 +598,70 @@
.header_Right { .header_Right {
// float: right; // float: right;
width: 20%; width: 111px;
text-align: center; height: 32px;
font-size: 26rpx; background: #FFFFFF;
height: 120rpx; opacity: 1;
padding: 20rpx 0; border-radius: 20px 0px 0px 20px;
position: absolute; position: absolute;
right: 0; right: 0;
top: 0; top: 10px;
z-index: 999999; z-index: 999999;
.showaddImg { .showaddImg {
width: 50rpx; width: 21px;
height: 50rpx; height: 21px;
margin-top: 5px;
margin-left: 10px;
}
.showAdd{
position: absolute;
top:8px;
right: 20px;
font-size: 12px;
font-family: PingFang SC;
font-weight: 500;
line-height: 17px;
color: #FF605A;
} }
} }
.header_cont { .header_cont {
clear: both; clear: both;
background-color: #FF4701; background-color: #FFFFFF;
width: 100%; width: 100%;
border-radius: 10rpx; border-radius: 10rpx;
height: 100rpx; height: 120px;
margin-top: 20rpx; margin-top: 20rpx;
color: #FFFFFF; color:#333333;
.title{
font-size: 16px;
font-family: PingFang SC;
font-weight: 500;
line-height: 22px;
color: #333333;
padding: 13px;
}
.line{
height: 1px;
background-color: #999999;
width: 100%;
opacity: 0.22;
}
.header_datas { .header_datas {
display: inline-block; display: inline-block;
width: 50%; width: 33%;
text-align: center; text-align: center;
padding: 10rpx 0; padding: 10rpx 0;
padding-left: 20px;
.numbers { .numbers {
font-size: 40rpx; font-size: 40rpx;
color: #FF605A;
} }
} }
} }
@ -660,39 +700,56 @@
} }
} }
} }
.shopList {
.shopManagement {
background: #FFF6F2;
border-radius: 15rpx;
padding: 20rpx;
.shopLoge {
width: 120rpx;
height: 120rpx;
float: left;
margin-right: 15rpx;
} }
.shop_r {
height: 120rpx;
.shop_name {
padding-left: 20rpx;
font-size: 30rpx;
color: #333333;
font-weight: 600;
line-height: 60rpx;
} }
.shuoDz { .shop-list-box{
font-size: 28rpx; width: 686rpx;
color: #999999; border-radius: 16rpx;
background: #fff;
margin: 0 auto;
.title{
width: 100%;
height: 96rpx;
display: flex;
align-items: center;
padding: 0 32rpx;
image{
width: 32rpx;
height: 32rpx;
margin-right: 8rpx;
} }
} }
.shop-item{
width: 100%;
padding: 32rpx;
display: flex;
border-top: 2rpx solid #E8E8E8;;
image{
width: 112rpx;
height: 112rpx;
margin-right: 32rpx;
border-radius: 16rpx;
}
.shop_r{
width: calc(100% - 160rpx);
font-size: 22rpx;
color: #333;
.shop_name{
width: 100%;
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap;
font-size: 28rpx;
font-weight: 500;
margin-bottom: 20rpx;
} }
} }
.dizhiIcon{
width: 16rpx;
height: 19rpx;
margin-right: 10rpx;
}
} }
} }

2
pages/member/chongzhi.vue

@ -81,7 +81,7 @@
if (avatar && avatar !== 'undefined') { if (avatar && avatar !== 'undefined') {
this.avatar = avatar; this.avatar = avatar;
} else { } else {
this.avatar = '/static/img/logo.jpg'; this.avatar = 'https://download.cyjyyjy.com/fq-logo.jpg';
} }
let nickName = this.$queue.getData('nickName'); let nickName = this.$queue.getData('nickName');
if (nickName && nickName !== 'undefined') { if (nickName && nickName !== 'undefined') {

99
pages/my/index.vue

@ -14,40 +14,37 @@
</view> </view>
<view class="phones" v-if="phone">{{phone.substr(0,4)}}****{{phone.substr(8,11)}}</view> <view class="phones" v-if="phone">{{phone.substr(0,4)}}****{{phone.substr(8,11)}}</view>
</view> </view>
<view class="noLogin" @tap="checkLogin()" v-else>登录</view> <view class="noLogin" @tap="checkLogin()" v-else>登录</view>
</view> </view>
</view> </view>
<view class="info-jifen"> <view class="info-jifen">
<view class="wdjf">账户资金</view>
<view class="shouye_item"> <view class="shouye_item">
<view class="shouye_item_left" @tap="myMoneyMessage"> <view class="shouye_item_left" @tap="myMoneyMessage">
<view class="shouye_item_money"><span style="font-size: 28rpx;">¥</span>{{myMoney}}</view>
<view class="shouye_item_text">账户余额</view> <view class="shouye_item_text">账户余额</view>
<view class="shouye_item_money"><span style="font-size: 28rpx;">¥</span>{{myMoney}}</view>
</view> </view>
<view class="shouye_item_center" @tap="moneyMessage"> <view class="shouye_item_center" @tap="moneyMessage">
<view class="shouye_item_money"><span style="font-size: 28rpx;">¥</span>{{money}}</view>
<view class="shouye_item_text">不可用金额</view> <view class="shouye_item_text">不可用金额</view>
<view class="shouye_item_money"><span style="font-size: 28rpx;">¥</span>{{money}}</view>
</view> </view>
<view class="shouye_item_right" @tap="cashMoneyMessage"> <view class="shouye_item_right" @tap="cashMoneyMessage">
<view class="shouye_item_money"><span style="font-size: 28rpx;">¥</span>{{cashMoney}}</view>
<view class="shouye_item_text">可用金额</view> <view class="shouye_item_text">可用金额</view>
<view class="shouye_item_money"><span style="font-size: 28rpx;">¥</span>{{cashMoney}}</view>
</view> </view>
</view> </view>
<view class="line"></view>
<view class="tuandui_item"> <view class="tuandui_item">
<view class="shouye_item_left" @tap="goPageLogin('/pages/my/recharge')"> <view class="shouye_item_left" @tap="goPageLogin('/pages/my/recharge')">
<image class="shouye_item_img" src="../../static/img/my/zhcz.png"></image> <image class="shouye_item_img" src="../../static/img/my/chongzhi.png"></image>
<view class="shouye_item_text">账户充值</view> <view class="shouye_item_text">账户充值</view>
</view> </view>
<view class="shouye_item_center" @tap="goPageLogin('/pages/my/withdrawal')"> <view class="shouye_item_center" @tap="goPageLogin('/pages/my/withdrawal')">
<image class="shouye_item_img" src="../../static/img/my/yetx.png"></image> <image class="shouye_item_img" src="../../static/img/my/tixian.png"></image>
<view class="shouye_item_text">余额提现</view> <view class="shouye_item_text">余额提现</view>
</view> </view>
<view class="shouye_item_right" @tap="goPageLogin('/pages/my/balanceHistory')"> <view class="shouye_item_right" @tap="goPageLogin('/pages/my/balanceHistory')">
<image class="shouye_item_img" src="../../static/img/my/yels.png"></image> <image class="shouye_item_img" src="../../static/img/my/lishi.png"></image>
<view class="shouye_item_text">余额历史</view> <view class="shouye_item_text">余额历史</view>
</view> </view>
</view> </view>
@ -57,35 +54,35 @@
<view class="integrals-box"> <view class="integrals-box">
<view class="integral" @tap="goPageLoginByMerchant('/pages/my/toExamine')"> <view class="integral" @tap="goPageLoginByMerchant('/pages/my/toExamine')">
<view class="left"> <view class="left">
<image src="../../static/img/my/spsh.png"></image> <image src="../../static/img/my/dingdan.png"></image>
<text>我的订单</text> <text>我的订单</text>
</view> </view>
<text class="right cuIcon-right"></text> <text class="right cuIcon-right"></text>
</view> </view>
<view class="integral" @tap="goPageLoginByMerchant('/pages/my/myshop')"> <view class="integral" @tap="goPageLoginByMerchant('/pages/my/myshop')">
<view class="left"> <view class="left">
<image src="../../static/img/my/wddp.png"></image> <image src="../../static/img/my/dianpu.png"></image>
<text>我的店铺</text> <text>我的店铺</text>
</view> </view>
<text class="right cuIcon-right"></text> <text class="right cuIcon-right"></text>
</view> </view>
<view class="integral" @tap="goPageLoginByMerchant('../activity/index')"> <view class="integral" @tap="goPageLoginByMerchant('../activity/index')">
<view class="left"> <view class="left">
<image src="../../static/img/my/hdgl.png"></image> <image src="../../static/img/my/huodong.png"></image>
<text>活动管理</text> <text>活动管理</text>
</view> </view>
<text class="right cuIcon-right"></text> <text class="right cuIcon-right"></text>
</view> </view>
<view class="integral" @tap="goPageLogin('/pages/my/cooperation')"> <!-- <view class="integral" @tap="goPageLogin('/pages/my/cooperation')">
<view class="left"> <view class="left">
<image src="../../static/img/my/dlhz.png"></image> <image src="../../static/img/my/dlhz.png"></image>
<text>代理合作</text> <text>代理合作</text>
</view> </view>
<text class="right cuIcon-right"></text> <text class="right cuIcon-right"></text>
</view> </view> -->
<view class="integral" @tap="goPageLogin('/pages/my/customer')"> <view class="integral" @tap="goPageLogin('/pages/my/customer')">
<view class="left"> <view class="left">
<image src="../../static/img/my/lxkf.png"></image> <image src="../../static/img/my/lianxikefu.png"></image>
<text>联系客服</text> <text>联系客服</text>
</view> </view>
<text class="right cuIcon-right"></text> <text class="right cuIcon-right"></text>
@ -94,35 +91,36 @@
<view class="integrals-box"> <view class="integrals-box">
<view class="integral" @tap="goPageLogin('/pages/my/account?className=商家教程')"> <view class="integral" @tap="goPageLogin('/pages/my/account?className=商家教程')">
<view class="left"> <view class="left">
<image src="../../static/img/my/sjjc.png"></image> <image src="../../static/img/my/jiaocheng.png"></image>
<text>商家教程</text> <text>商家教程</text>
</view> </view>
<text class="right cuIcon-right"></text> <text class="right cuIcon-right"></text>
</view> </view>
<view class="integral" v-if="userId" @tap='loginOut()'> <!-- <view class="integral" v-if="userId" @tap='loginOut()'>
<view class="left"> <view class="left">
<image src="../../static/img/my/qwyhd.png"></image> <image src="../../static/img/my/qwyhd.png"></image>
<text>前往用户端</text> <text>前往用户端</text>
</view> </view>
<text class="right cuIcon-right"></text> <text class="right cuIcon-right"></text>
</view> </view> -->
<view class="integral"> <view class="integral">
<view class="left"> <view class="left">
<image src="../../static/img/my/fenxiang.png"></image> <image src="../../static/img/my/share.png"></image>
<button open-type="share" style="background: #FFFFFF;border: none;padding-left: 34rpx;font-size: 30rpx;font-weight: 500;">分享给其他商家</button> <button open-type="share"
style="background: #FFFFFF;border: none;padding-left: 34rpx;font-size: 30rpx;font-weight: 500;">分享给其他商家</button>
</view> </view>
<text class="right cuIcon-right"></text> <text class="right cuIcon-right"></text>
</view> </view>
<view class="integral" @tap="goPageLogin('/pages/my/account?className=关于我们')"> <view class="integral" @tap="goPageLogin('/pages/my/account?className=关于我们')">
<view class="left"> <view class="left">
<image src="../../static/img/my/gywm.png"></image> <image src="../../static/img/my/about.png"></image>
<text>关于我们</text> <text>关于我们</text>
</view> </view>
<text class="right cuIcon-right"></text> <text class="right cuIcon-right"></text>
</view> </view>
<view class="integral" @tap="goPageLogin('/pages/member/feedback')"> <view class="integral" @tap="goPageLogin('/pages/member/feedback')">
<view class="left"> <view class="left">
<image src="../../static/img/my/fankui.png"></image> <image src="../../static/img/my/yjfk.png"></image>
<text>意见反馈</text> <text>意见反馈</text>
</view> </view>
<text class="right cuIcon-right"></text> <text class="right cuIcon-right"></text>
@ -140,15 +138,15 @@
export default { export default {
data() { data() {
return { return {
avatar: "/static/img/logo.jpg", avatar: "https://download.cyjyyjy.com/fq-logo.jpg",
member: 0, member: 0,
total: 0, total: 0,
tuiguang:'', tuiguang: '',
backgroundImageUrl:'', backgroundImageUrl: '',
CompanylinkUrl: '', CompanylinkUrl: '',
Companyname: '', Companyname: '',
userId: '', userId: '',
shopcourse:'', shopcourse: '',
nickName: "", nickName: "",
isStudent: -1, isStudent: -1,
MerchantList: 0, MerchantList: 0,
@ -184,7 +182,7 @@
if (avatar && avatar !== 'undefined') { if (avatar && avatar !== 'undefined') {
this.avatar = avatar; this.avatar = avatar;
} else { } else {
this.avatar = '/static/img/logo.jpg'; this.avatar = 'https://download.cyjyyjy.com/fq-logo.jpg';
} }
let nickName = this.$queue.getData('nickName'); let nickName = this.$queue.getData('nickName');
if (nickName && nickName !== 'undefined') { if (nickName && nickName !== 'undefined') {
@ -230,7 +228,7 @@
let token = this.$queue.getData('token'); let token = this.$queue.getData('token');
let userId = this.$queue.getData('userId'); let userId = this.$queue.getData('userId');
if (token) { if (token) {
if(!url){ if (!url) {
return; return;
} }
if (url.indexOf('/pages/') !== -1) { if (url.indexOf('/pages/') !== -1) {
@ -276,7 +274,8 @@
}); });
}, },
getShopList(userId) { getShopList(userId) {
this.$Request.getT('/goodsMerchant/selectGoodsMerchantPage?page=1&limit=10&userId=' + userId + '&status=2').then(res => { this.$Request.getT('/goodsMerchant/selectGoodsMerchantPage?page=1&limit=10&userId=' + userId + '&status=2')
.then(res => {
if (res.code == 0) { if (res.code == 0) {
if (res.data.records.length > 0) { if (res.data.records.length > 0) {
this.$queue.setData('merchantId', res.data.records[0].merchantId); this.$queue.setData('merchantId', res.data.records[0].merchantId);
@ -303,7 +302,7 @@
if (res.code === 0) { if (res.code === 0) {
this.money = res.data.cannotMoney ? res.data.cannotMoney : 0; this.money = res.data.cannotMoney ? res.data.cannotMoney : 0;
this.cashMoney = res.data.mayMoney ? res.data.mayMoney : 0; this.cashMoney = res.data.mayMoney ? res.data.mayMoney : 0;
this.myMoney = parseFloat(this.money) + parseFloat(this.cashMoney); this.myMoney = (parseFloat(this.money) + parseFloat(this.cashMoney)).toFixed(2);
} }
}); });
}, },
@ -315,7 +314,7 @@
this.sex = res.data.sex; this.sex = res.data.sex;
this.phone = res.data.phone; this.phone = res.data.phone;
this.$queue.setData("avatar", res.data.imageUrl ? res.data.imageUrl : this.$queue.setData("avatar", res.data.imageUrl ? res.data.imageUrl :
'/static/img/logo.jpg'); 'https://download.cyjyyjy.com/fq-logo.jpg');
this.$queue.setData("nickName", res.data.nickName ? res.data.nickName : res.data.phone); this.$queue.setData("nickName", res.data.nickName ? res.data.nickName : res.data.phone);
this.$queue.setData("mobile", res.data.phone); this.$queue.setData("mobile", res.data.phone);
this.$queue.setData("invitationCode", res.data.invitationCode); this.$queue.setData("invitationCode", res.data.invitationCode);
@ -432,7 +431,7 @@
let token = this.$queue.getData('token'); let token = this.$queue.getData('token');
if (token) { if (token) {
// if (this.MerchantList == 1) { // if (this.MerchantList == 1) {
if (url == "../activity/index") { if (url == "../activity/index" || url == "/pages/my/toExamine") {
uni.switchTab({ uni.switchTab({
url: url url: url
}) })
@ -516,7 +515,7 @@
.header { .header {
width: 100%; width: 100%;
height: 600rpx; height: 500rpx;
display: block; display: block;
position: relative; position: relative;
// background: #fff; // background: #fff;
@ -533,11 +532,11 @@
height: 425rpx; height: 425rpx;
position: absolute; position: absolute;
z-index: 15; z-index: 15;
padding: 100upx 30upx 0; padding: 0 30upx;
display: flex; display: flex;
align-items: center; align-items: center;
// background: #FF4701; // background: #FF4701;
background-image: url(../../static/img/my/myuser.png);
background-size: 100%; background-size: 100%;
.user-info-box { .user-info-box {
@ -567,7 +566,7 @@
margin-left: 20rpx; margin-left: 20rpx;
font-size: 40upx; font-size: 40upx;
font-weight: 800; font-weight: 800;
color: #FEFEFE; color: #333333;
} }
.user-info { .user-info {
@ -587,7 +586,7 @@
height: 38upx; height: 38upx;
line-height: 38upx; line-height: 38upx;
font-weight: 800; font-weight: 800;
color: #fff; color:#333333;
} }
.nick_image { .nick_image {
@ -611,7 +610,7 @@
} }
.phones { .phones {
color: #fff; color:#333333!important;
margin-top: 15rpx; margin-top: 15rpx;
} }
@ -647,10 +646,10 @@
width: 92%; width: 92%;
height: 360rpx; height: 360rpx;
position: absolute; position: absolute;
background: #fff; background: linear-gradient(50deg, #FF4848 0%, #FF6E6E 100%);
border-radius: 15rpx; border-radius: 15rpx;
z-index: 15; z-index: 15;
margin: 235upx 30upx 0; margin: 120upx 30upx 0;
padding: 20upx; padding: 20upx;
box-sizing: border-box; box-sizing: border-box;
box-shadow: 0 0 3px 1px #ccc; box-shadow: 0 0 3px 1px #ccc;
@ -659,28 +658,34 @@
margin-top: 10rpx; margin-top: 10rpx;
font-size: 34rpx; font-size: 34rpx;
font-weight: 400; font-weight: 400;
color: #806C30; color: #FFFFFF;
}
.line{
height: 1px;
background-color: #FFFFFF;
margin-top: 20px;
} }
.shouye_item { .shouye_item {
margin-top: 20rpx; margin-top: 20rpx;
display: flex; display: flex;
width: 100%; width: 100%;
color: #333333; color: #FFFFFF;
// text-align: justify; // text-align: justify;
text-align: center; text-align: center;
padding: 0rpx 20rpx; padding: 0rpx 20rpx;
justify-content: space-between; justify-content: space-between;
.shouye_item_text { .shouye_item_text {
color: #806C30; color: #FFFFFF;
font-size: 24rpx; font-size: 24rpx;
} }
.shouye_item_money { .shouye_item_money {
margin-top: 10rpx; margin-top: 10rpx;
font-size: 38rpx; font-size: 20px;
color: #FF4701; color: #FFFFFF;
} }
.shouye_item_left { .shouye_item_left {
@ -732,7 +737,7 @@
} }
.shouye_item_text { .shouye_item_text {
color: #999; color: #FFFFFF;
font-size: 24rpx; font-size: 24rpx;
} }

3
pages/my/myshop.vue

@ -214,8 +214,9 @@
width: 92%; width: 92%;
margin: 0 4%; margin: 0 4%;
box-sizing: border-box; box-sizing: border-box;
background: #FF4701; background: #FF2B2B;
color: #fff; color: #fff;
border-radius: 8px;
} }
} }

2
pages/my/ranking.vue

@ -43,7 +43,7 @@
data() { data() {
return { return {
rankingList: [], rankingList: [],
imageUrl: '/static/img/logo.jpg', imageUrl: 'https://download.cyjyyjy.com/fq-logo.jpg',
money: 0, money: 0,
page: 1, page: 1,
limit: 20, limit: 20,

15
pages/my/toExamine.vue

@ -15,9 +15,9 @@
<image class="logo" :src="merchantLogo"></image> <image class="logo" :src="merchantLogo"></image>
</view> </view>
<view class="left_down"> <view class="left_down">
<image class="icons1" src="../../static/img/home/datas.png"></image> <image class="icons1" src="../../static/img/home/calendar.png"></image>
<view class="times"><span @tap="times(1)" style="text-decoration:underline">{{startTime}} <view class="times"><span @tap="times(1)" >{{startTime}}
</span><span @tap="times(2)" style="text-decoration:underline">{{endTime}}</span> </span><span @tap="times(2)" >{{endTime}}</span>
</view> </view>
<u-picker mode="time" v-model="show1" title="开始时间" @confirm="times1()" :params="params"> <u-picker mode="time" v-model="show1" title="开始时间" @confirm="times1()" :params="params">
</u-picker> </u-picker>
@ -57,7 +57,7 @@
data() { data() {
return { return {
colors: '#FF4701', colors: '#FF4701',
merchantLogo: '../../static/img/logo.jpg', merchantLogo: 'https://download.cyjyyjy.com/fq-logo.jpg',
merchantId: 0, merchantId: 0,
startDate: 0, startDate: 0,
endDate: 0, endDate: 0,
@ -109,9 +109,16 @@
let userId = this.$queue.getData('userId'); let userId = this.$queue.getData('userId');
if (userId) { if (userId) {
this.getShopList(userId); this.getShopList(userId);
this.page = 1;
} }
uni.$on('update', this.callback) uni.$on('update', this.callback)
}, },
onShow() {
let userId = this.$queue.getData('userId');
if (userId) {
this.getShopList(userId);
}
},
onUnload() { onUnload() {
// //
uni.$off(); uni.$off();

53
pages/my/withdrawal.vue

@ -44,6 +44,7 @@
</template> </template>
<script> <script>
import notifyMsg from "@/common/notifyMsg.js"
export default { export default {
data() { data() {
return { return {
@ -92,60 +93,12 @@
this.zhifubaoName = this.$queue.getData("zhifubaoName"); this.zhifubaoName = this.$queue.getData("zhifubaoName");
// //
if (this.showModal) { if (this.showModal) {
this.openMsg() notifyMsg.openMsg();
} }
} }
this.getasdas(); this.getasdas();
}, },
methods: { methods: {
//
openMsg() {
var that = this
wx.getSetting({
withSubscriptions: true, //false
success(ret) {
// console.log(ret,'------------------')
// console.log(Object.keys(ret.subscriptionsSetting.itemSettings).length)
// if (JSON.stringify(ret.subscriptionsSetting.itemSettings).indexOf('accept')!=-1) {
if (ret.subscriptionsSetting.itemSettings) {
uni.setStorageSync('sendjifenMsg', true)
uni.openSetting({ //
success(rea) {
console.log(rea.authSetting)
}
});
} else { //
uni.setStorageSync('sendjifenMsg', false)
uni.showModal({
title: '提示',
content: '为了更好的体验,请绑定消息推送',
confirmText: '确定',
cancelText: '取消',
success: function(res) {
if (res.confirm) {
uni.requestSubscribeMessage({
tmplIds: that.arr,
success(re) {
// console.log(re,'**********')
var datas = JSON.stringify(re);
if (datas.indexOf("accept") != -1) {
console.log(re)
}
},
fail: (res) => {
console.log(res)
}
})
that.showModal = false
} else if (res.cancel) {
that.showModal = true
}
}
})
}
}
})
},
typeSelect(type) { typeSelect(type) {
if (uni.getStorageSync('sendjifenMsg')) { if (uni.getStorageSync('sendjifenMsg')) {
uni.requestSubscribeMessage({ uni.requestSubscribeMessage({
@ -173,7 +126,7 @@
this.$Request.postT("/app/selectUserById?userId=" + userId).then(res => { this.$Request.postT("/app/selectUserById?userId=" + userId).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.$queue.setData("avatar", res.data.imageUrl ? res.data.imageUrl : this.$queue.setData("avatar", res.data.imageUrl ? res.data.imageUrl :
'/static/img/logo.jpg'); 'https://download.cyjyyjy.com/fq-logo.jpg');
this.$queue.setData("nickName", res.data.nickName ? res.data.nickName : res.data.phone); this.$queue.setData("nickName", res.data.nickName ? res.data.nickName : res.data.phone);
this.$queue.setData("mobile", res.data.phone); this.$queue.setData("mobile", res.data.phone);
this.$queue.setData("invitationCode", res.data.invitationCode); this.$queue.setData("invitationCode", res.data.invitationCode);

8
pages/public/login.vue

@ -5,7 +5,7 @@
<view class="mp_wxBox"> <view class="mp_wxBox">
<view> <view>
<view class="headers"> <view class="headers">
<image src="../../static/img/logo.jpg" style="border-radius: 50%;"></image> <image src="https://download.cyjyyjy.com/fq-logo.jpg" style="border-radius: 50%;"></image>
</view> </view>
<view class="content"> <view class="content">
<view>申请获取以下权限</view> <view>申请获取以下权限</view>
@ -31,8 +31,6 @@
<!-- 协议地址 --> <!-- 协议地址 -->
<navigator url="/pages/member/mimi" open-type="navigate">隐私政策</navigator> <navigator url="/pages/member/mimi" open-type="navigate">隐私政策</navigator>
<navigator url="/pages/member/xieyi" open-type="navigate">用户服务协议</navigator> <navigator url="/pages/member/xieyi" open-type="navigate">用户服务协议</navigator>
</view> </view>
</view> </view>
</view> </view>
@ -142,7 +140,7 @@
that.$queue.setData('userId', res.user.userId); that.$queue.setData('userId', res.user.userId);
that.$queue.setData("avatar", res.user.imageUrl ? res.user.imageUrl : that.$queue.setData("avatar", res.user.imageUrl ? res.user.imageUrl :
'/static/img/logo.jpg'); 'https://download.cyjyyjy.com/fq-logo.jpg');
that.$queue.setData("nickName", res.user.nickName ? res.user.nickName : res.user.phone); that.$queue.setData("nickName", res.user.nickName ? res.user.nickName : res.user.phone);
that.$queue.setData("mobile", res.user.phone); that.$queue.setData("mobile", res.user.phone);
that.$queue.setData("invitationCode", res.user.invitationCode); that.$queue.setData("invitationCode", res.user.invitationCode);
@ -268,7 +266,7 @@
this.$Request.postT('/app/selectUserById?userId=' + userId).then(res => { this.$Request.postT('/app/selectUserById?userId=' + userId).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.$queue.setData('avatar', res.data.imageUrl ? res.data.imageUrl : this.$queue.setData('avatar', res.data.imageUrl ? res.data.imageUrl :
'/static/img/logo.jpg'); 'https://download.cyjyyjy.com/fq-logo.jpg');
this.$queue.setData('nickName', res.data.nickName ? res.data.nickName : res.data.phone); this.$queue.setData('nickName', res.data.nickName ? res.data.nickName : res.data.phone);
this.$queue.setData('mobile', res.data.phone); this.$queue.setData('mobile', res.data.phone);
this.$queue.setData('invitationCode', res.data.invitationCode); this.$queue.setData('invitationCode', res.data.invitationCode);

2
pages/public/mobile.vue

@ -1,7 +1,7 @@
<template> <template>
<view class="container"> <view class="container">
<view style="display: flex;margin: 40upx;"> <view style="display: flex;margin: 40upx;">
<image src="../../static/img/logo.jpg" mode="aspectFit" style="width: 140upx;height: 140upx;border-radius: 16upx;"></image> <image src="https://download.cyjyyjy.com/fq-logo.jpg" mode="aspectFit" style="width: 140upx;height: 140upx;border-radius: 16upx;"></image>
<view style="margin-left: 32upx;"> <view style="margin-left: 32upx;">
<view style="color: #e10a07;font-size: 32upx;">实名提醒</view> <view style="color: #e10a07;font-size: 32upx;">实名提醒</view>
<view style="margin-right: 120upx;font-size: 28upx;color: #999999;margin-top: 16upx;">应国家法律要求全面实行实名制须绑定手机完成认证</view> <view style="margin-right: 120upx;font-size: 28upx;color: #999999;margin-top: 16upx;">应国家法律要求全面实行实名制须绑定手机完成认证</view>

69
project.config.json

@ -0,0 +1,69 @@
{
"description": "项目配置文件",
"packOptions": {
"ignore": []
},
"setting": {
"bundle": false,
"userConfirmedBundleSwitch": false,
"urlCheck": true,
"scopeDataCheck": false,
"coverView": true,
"es6": true,
"postcss": true,
"compileHotReLoad": false,
"lazyloadPlaceholderEnable": false,
"preloadBackgroundData": false,
"minified": true,
"autoAudits": false,
"newFeature": false,
"uglifyFileName": false,
"uploadWithSourceMap": true,
"useIsolateContext": true,
"nodeModules": false,
"enhance": true,
"useMultiFrameRuntime": true,
"useApiHook": true,
"useApiHostProcess": true,
"showShadowRootInWxmlPanel": true,
"packNpmManually": false,
"enableEngineNative": false,
"packNpmRelationList": [],
"minifyWXSS": true,
"showES6CompileOption": false,
"minifyWXML": true
},
"compileType": "miniprogram",
"libVersion": "2.20.2",
"appid": "wx5f5b49c361569a10",
"projectname": "miniprogram-1",
"debugOptions": {
"hidedInDevtools": []
},
"scripts": {},
"staticServerOptions": {
"baseURL": "",
"servePath": ""
},
"isGameTourist": false,
"condition": {
"search": {
"list": []
},
"conversation": {
"list": []
},
"game": {
"list": []
},
"plugin": {
"list": []
},
"gamePlugin": {
"list": []
},
"miniprogram": {
"list": []
}
}
}

BIN
static/img/home/calendar.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 396 B

BIN
static/img/home/feiji.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 588 B

BIN
static/img/home/money.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.7 KiB

BIN
static/img/home/title-logo.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
static/img/home/xinzeng.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 715 B

BIN
static/img/my/about.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
static/img/my/chongzhi.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
static/img/my/dianpu.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
static/img/my/dingdan.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 482 B

BIN
static/img/my/huodong.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 516 B

BIN
static/img/my/jiaocheng.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
static/img/my/lianxikefu.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
static/img/my/lishi.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
static/img/my/share.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
static/img/my/tixian.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 820 B

BIN
static/img/my/yjfk.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 463 B

BIN
static/img/tabbar/activity.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
static/img/tabbar/activityselected.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 987 B

BIN
static/img/tabbar/dingdan.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 688 B

BIN
static/img/tabbar/dingdans.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 659 B

BIN
static/img/tabbar/mine.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
static/img/tabbar/mines.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
static/img/tabbar/shop2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
static/img/tabbar/shopselected.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Loading…
Cancel
Save