theluyuan/demingshangjia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: theluyuan:master
Branches Tags
theluyuan:master
theluyuan:qxf
theluyuan:zhy
theluyuan:xbx
theluyuan:gyh
theluyuan:cmx
theluyuan:zmr
theluyuan:lxb
..
compare: theluyuan:xbx
Branches Tags
theluyuan:qxf
theluyuan:master
theluyuan:zhy
theluyuan:xbx
theluyuan:gyh
theluyuan:cmx
theluyuan:zmr
theluyuan:lxb

No commits in common. "master" and "xbx" have entirely different histories.
master ... xbx

18 changed files with 115 additions and 1025 deletions
Show Stats Expand all files Collapse all files

6
App.vue
View File

@ -10,7 +10,7 @@ export default {
// #endif // #endif
getApp().globalData.im = this.imService getApp().globalData.im = this.imService
// console.log('App Launch'); console.log('App Launch');
// 缓存token // 缓存token
uni.getStorage({ uni.getStorage({
key: "token", key: "token",
@ -22,10 +22,10 @@ export default {
}) })
}, },
onShow: function() { onShow: function() {
// console.log('App Show'); console.log('App Show');
}, },
onHide: function() { onHide: function() {
// console.log('App Hide'); console.log('App Hide');
} }
}; };
</script> </script>

5
components/order-item/index.vue
View File

@ -14,13 +14,12 @@
<view class="status" v-else-if="info.view_type==5">已退款订单</view> <view class="status" v-else-if="info.view_type==5">已退款订单</view>
<view class="status" v-else-if="info.view_type==6">商家同意</view> <view class="status" v-else-if="info.view_type==6">商家同意</view>
<view class="status" v-else-if="info.view_type==7">商家拒绝</view> <view class="status" v-else-if="info.view_type==7">商家拒绝</view>
<view class="status" v-else-if="info.view_type==10">待支付订单</view>
</view> </view>
<view class="name u-line-1">{{info.extend_order_goods[0].goods_name}}</view> <view class="name u-line-1">{{info.extend_order_goods[0].goods_name}}</view>
<view class="info"> <view class="info">
<view class="num">共{{info.count_number}}件商品</view> <view class="num">共{{info.count_number}}件商品</view>
<view class="price">{{ info.view_type==10 ? "待支付" : "实付" }}<span>￥{{info.order_amount}}</span></view> <view class="price">实付<span>￥{{info.order_amount}}</span></view>
<view class="time">{{ info.view_type==10 ? info.add_time.slice(5,16) : info.payment_time.slice(5,16) }}</view> <view class="time">{{ info.payment_time.slice(5,16) }}</view>
</view> </view>
</view> </view>
</view> </view>

46
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "德铭阳光商家", "name" : "德铭阳光商家",
"appid" : "__UNI__EA895BE", "appid" : "__UNI__EA895BE",
"description" : "", "description" : "",
"versionName" : "1.0.1", "versionName" : "1.0.0",
"versionCode" : 103, "versionCode" : "100",
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {
@ -61,13 +61,7 @@
"abiFilters" : [ "armeabi-v7a", "x86" ] "abiFilters" : [ "armeabi-v7a", "x86" ]
}, },
/* ios打包配置 */ /* ios打包配置 */
"ios" : { "ios" : {},
"privacyDescription" : {
"NSPhotoLibraryUsageDescription" : "应用将在您上传图文视频等服务中使用您的相册。",
"NSMicrophoneUsageDescription" : "应用将会在您开启直播时使用您的麦克风。",
"NSCameraUsageDescription" : "应用将会在您开启直播时使用您的摄像头。"
}
},
/* SDK配置 */ /* SDK配置 */
"sdkConfigs" : { "sdkConfigs" : {
"ad" : {}, "ad" : {},
@ -77,13 +71,13 @@
}, },
"icons" : { "icons" : {
"android" : { "android" : {
"hdpi" : "unpackage/res/icons/72x72.png", "hdpi" : "E:/Source-code/appleidmore/安卓png/72x72psd.PNG",
"xhdpi" : "unpackage/res/icons/96x96.png", "xhdpi" : "E:/Source-code/appleidmore/安卓png/96x96psd.PNG",
"xxhdpi" : "unpackage/res/icons/144x144.png", "xxhdpi" : "E:/Source-code/appleidmore/安卓png/144x144.PNG",
"xxxhdpi" : "unpackage/res/icons/192x192.png" "xxxhdpi" : "E:/Source-code/appleidmore/安卓png/192x192.PNG"
}, },
"ios" : { "ios" : {
"appstore" : "unpackage/res/icons/1024x1024.png", "appstore" : "E:/Source-code/appleidmore/苹果png/appstore 1024X1024.PNG",
"ipad" : { "ipad" : {
"app" : "unpackage/res/icons/76x76.png", "app" : "unpackage/res/icons/76x76.png",
"app@2x" : "unpackage/res/icons/152x152.png", "app@2x" : "unpackage/res/icons/152x152.png",
@ -96,27 +90,27 @@
"spotlight@2x" : "unpackage/res/icons/80x80.png" "spotlight@2x" : "unpackage/res/icons/80x80.png"
}, },
"iphone" : { "iphone" : {
"app@2x" : "unpackage/res/icons/120x120.png", "app@2x" : "E:/Source-code/appleidmore/苹果png/120x120.PNG",
"app@3x" : "unpackage/res/icons/180x180.png", "app@3x" : "E:/Source-code/appleidmore/苹果png/180x180.PNG",
"notification@2x" : "unpackage/res/icons/40x40.png", "notification@2x" : "E:/Source-code/appleidmore/苹果png/40X40.PNG",
"notification@3x" : "unpackage/res/icons/60x60.png", "notification@3x" : "E:/Source-code/appleidmore/苹果png/60X60.PNG",
"settings@2x" : "unpackage/res/icons/58x58.png", "settings@2x" : "E:/Source-code/appleidmore/苹果png/58x58psd.PNG",
"settings@3x" : "unpackage/res/icons/87x87.png", "settings@3x" : "E:/Source-code/appleidmore/苹果png/87X87.PNG",
"spotlight@2x" : "unpackage/res/icons/80x80.png", "spotlight@2x" : "E:/Source-code/appleidmore/苹果png/80x80.PNG",
"spotlight@3x" : "unpackage/res/icons/120x120.png" "spotlight@3x" : "E:/Source-code/appleidmore/苹果png/120x120.PNG"
} }
} }
}, },
"splashscreen" : { "splashscreen" : {
"iosStyle" : "storyboard", "iosStyle" : "storyboard",
"ios" : { "ios" : {
"storyboard" : "/Users/xf/workspace/wwwroot/deming-uniapp/static/CustomStoryboard.zip" "storyboard" : "E:/Source-code/deming/static/CustomStoryboard.zip"
}, },
"androidStyle" : "default", "androidStyle" : "default",
"android" : { "android" : {
"hdpi" : "/Users/xf/workspace/wwwroot/deming-uniapp/static/app/start/480x762.png", "hdpi" : "E:/Source-code/deming/static/app/start/480x762.png",
"xhdpi" : "/Users/xf/workspace/wwwroot/deming-uniapp/static/app/start/720x1242.png", "xhdpi" : "E:/Source-code/deming/static/app/start/720x1242.png",
"xxhdpi" : "/Users/xf/workspace/wwwroot/deming-uniapp/static/app/start/1080x1882.png" "xxhdpi" : "E:/Source-code/deming/static/app/start/1080x1882.png"
} }
} }
} }

39
pages.json
View File

@ -13,30 +13,6 @@
} }
} }
}, },
{
"path": "pages/login/agreements",
"style": {
"navigationBarTitleText": "用户协议",
"app-plus": {
"titleNView": {
"backgroundColor": "#FFFFFF",
"titleColor": "#333333"
}
}
}
},
{
"path": "pages/login/privacy_policy",
"style": {
"navigationBarTitleText": "隐私政策",
"app-plus": {
"titleNView": {
"backgroundColor": "#FFFFFF",
"titleColor": "#333333"
}
}
}
},
{ {
"path": "pages/release/tosign", "path": "pages/release/tosign",
"style": { "style": {
@ -73,7 +49,7 @@
{ {
"path": "pages/index/index", "path": "pages/index/index",
"style": { "style": {
"navigationBarTitleText": "德铭阳光商家", "navigationBarTitleText": "德铭阳光在线",
"app-plus": { "app-plus": {
"titleNView": { "titleNView": {
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
@ -246,18 +222,6 @@
} }
} }
}, },
{
"path": "pages/user/feedback",
"style": {
"navigationBarTitleText": "用户反馈",
"app-plus": {
"titleNView": {
"backgroundColor": "#FFFFFF",
"titleColor": "#333333"
}
}
}
},
{ {
"path": "pages/user/complaintDetails", "path": "pages/user/complaintDetails",
"style": { "style": {
@ -349,5 +313,6 @@
"text": "我的", "text": "我的",
"selectedColor": "#FBFBFB" "selectedColor": "#FBFBFB"
}] }]
} }
} }

74
pages/index/details.vue
View File

@ -23,7 +23,7 @@
<view class="info"> <view class="info">
<view class="num">共{{ list.goods_num }}件商品</view> <view class="num">共{{ list.goods_num }}件商品</view>
<view class="price"> <view class="price">
{{ type == 10 ? "待支付" : "实付" }} 实付
<span>￥{{ list.goods_pay_price }}</span> <span>￥{{ list.goods_pay_price }}</span>
</view> </view>
</view> </view>
@ -146,38 +146,6 @@
<view class="refund" v-if="type == 5 ">退款状态:同意退款，请注意查收！</view> <view class="refund" v-if="type == 5 ">退款状态:同意退款，请注意查收！</view>
<view class="refund" v-if="type == 6 ">退款状态:商家同意退款，等待后台处理！</view> <view class="refund" v-if="type == 6 ">退款状态:商家同意退款，等待后台处理！</view>
<view class="refund" v-if="type == 7 ">退款状态:商家拒绝退款，请等待客服联系！</view> <view class="refund" v-if="type == 7 ">退款状态:商家拒绝退款，请等待客服联系！</view>
<view class="pain-box" v-if="type == 10 ">
<view class="info-container">
<view>
<view class="title">姓名</view>
<view class="value">{{ info.extend_order_common.reciver_name }}</view>
<image src="/static/image/home/chat.png" @click="tochat(info.buyer_id)"></image>
</view>
<view>
<view class="title">手机号</view>
<view class="value" @longtap="longtap(info.extend_order_common.reciver_info.mob_phone)">{{ info.extend_order_common.reciver_info.mob_phone }}</view>
</view>
<view>
<view class="title">收货地址</view>
<view class="value u-line-2" @longtap="longtap(info.extend_order_common.reciver_info.address)">{{ info.extend_order_common.reciver_info.address }}</view>
</view>
<view>
<view class="title">派送方式</view>
<view class="value u-line-1">{{ users_type == 0 ? "-" : users_type == 1 ? "快递" : users_type == 2 ? "骑手" : "自提" }}</view>
</view>
<view class="remark">
<view class="title">订单备注</view>
<view class="value" @longtap="longtap(info.extend_order_common.order_message)">{{ info.extend_order_common.order_message }}</view>
</view>
<view @click="showInvoice">
<view class="title">开具发票</view>
<view class="invoice">
<text>{{ is_invoice ? "是" : "否" }}</text>
<u-icon name="arrow-right" color="#999" size="20" style="margin-left: 10rpx;"></u-icon>
</view>
</view>
</view>
</view>
<u-popup v-model="showDelivery" mode="center" border-radius="10" class="delivery-popup"> <u-popup v-model="showDelivery" mode="center" border-radius="10" class="delivery-popup">
<view class="title">骑手信息</view> <view class="title">骑手信息</view>
<view class="input-info"> <view class="input-info">
@ -845,46 +813,6 @@ export default {
} }
} }
} }
.pain-box {
.info-container {
padding: 0 30rpx;
margin-bottom: 20rpx;
background-color: #ffffff;
.remark {
padding: 10rpx 0;
height: 100%;
min-height: 88rpx;
}
> view {
display: flex;
align-items: center;
height: 88rpx;
padding: 10rpx 0;
color: rgba(51, 51, 51, 1);
&:not(:last-child) {
border-bottom: 2rpx solid #ececec;
}
.title {
width: 150rpx;
font-size: 30rpx;
margin-right: 10rpx;
}
.value {
font-size: 26rpx;
flex: 1;
}
.invoice {
margin-left: auto;
font-size: 26rpx;
color: #333;
}
image{
width: 40rpx;
height: 40rpx;
}
}
}
}
.delivery { .delivery {
flex: 1; flex: 1;
background-color: #ffffff; background-color: #ffffff;

22
pages/index/index.vue
View File

@ -56,12 +56,6 @@
</view> </view>
<u-empty margin-top="20" v-if="!badlist.length" mode="order"></u-empty> <u-empty margin-top="20" v-if="!badlist.length" mode="order"></u-empty>
</view> </view>
<view v-else-if="current == 7">
<view v-for="(item, index) in paidList" :key="index">
<OrderItem :info="item"></OrderItem>
</view>
<u-empty margin-top="20" v-if="!paidList.length" mode="order"></u-empty>
</view>
<view class="release-btn" @click="publish"> <view class="release-btn" @click="publish">
<image src="../../static/image/index/publish.png"></image> <image src="../../static/image/index/publish.png"></image>
<view class="text">发布</view> <view class="text">发布</view>
@ -130,10 +124,7 @@ export default {
}, },
{ {
name: '退货订单' name: '退货订单'
}, }
{
name: '待支付订单'
}
], ],
imageList: [], imageList: [],
showSelect: false, showSelect: false,
@ -151,7 +142,6 @@ export default {
finshlist: [], //已完成列表 finshlist: [], //已完成列表
badlist: [], //退货列表 badlist: [], //退货列表
carlist: [], //可投诉订单列表 carlist: [], //可投诉订单列表
paidList: [], // 待支付订单
reportinfo: null, //投诉信息 reportinfo: null, //投诉信息
reportcontent: '', //投诉内容 reportcontent: '', //投诉内容
del_id: 0, // 删除id del_id: 0, // 删除id
@ -188,7 +178,6 @@ export default {
this.badlist = []; this.badlist = [];
this.badlist = []; this.badlist = [];
this.testlist = []; this.testlist = [];
this.paidList = [];
}, },
// 根据current请求不同的接口 // 根据current请求不同的接口
reset() { reset() {
@ -213,10 +202,7 @@ export default {
} else if (current == 6) { } else if (current == 6) {
// 退货订单 // 退货订单
this.getallorder(4); this.getallorder(4);
} else if (current == 7) { }
// 待支付订单
this.getallorder(10);
}
}, },
// 关闭发布弹窗 // 关闭发布弹窗
close() { close() {
@ -346,9 +332,7 @@ export default {
this.badlist.push(arr[index]); this.badlist.push(arr[index]);
} else if (type == 5) { } else if (type == 5) {
this.badlist.push(arr[index]); this.badlist.push(arr[index]);
} else if (type == 10) { }
this.paidList.push(arr[index]);
}
} }
} }
}); });

2
pages/index/otherdetails.vue
View File

@ -165,7 +165,7 @@ export default {
} else { } else {
this.$u.api.agreetest({ this.$u.api.agreetest({
goods_try_id: this.orderid, goods_try_id: this.orderid,
type: 2, type: 1,
takeawayer_id: this.selctcar.takeawayer_id takeawayer_id: this.selctcar.takeawayer_id
}).then(res => { }).then(res => {
console.log(res); console.log(res);

506
pages/login/agreements.vue
View File

File diff suppressed because one or more lines are too long

153
pages/login/login.vue
View File

@ -51,15 +51,6 @@
</view> </view>
</view> </view>
</view> </view>
<!-- 服务协议 -->
<view class="pact">
<view class="pact-container">
<u-checkbox v-model="consentPact" shape="circle" size="30" label-size="26" icon-size="12" active-color="#ff780f">
<text>我已详细阅读并同意</text>
</u-checkbox>
<text class="pact-items" v-for="item in pactList" :key="item.id" @click="viewAgreement(item.id)"> {{ item.text }}</text>
</view>
</view>
<!-- denglu QQ weixin --> <!-- denglu QQ weixin -->
<button @click="logins">{{ login }}</button> <button @click="logins">{{ login }}</button>
<!-- <u-button :custom-style="customStyle" ></u-button> --> <!-- <u-button :custom-style="customStyle" ></u-button> -->
@ -85,20 +76,14 @@ export default {
zhanghaoA: '', zhanghaoA: '',
mimaA: '', mimaA: '',
url: '', url: '',
phone: "", phone: "",
code: "", code: "",
state:0, state:0,
clickstate:false, clickstate:false,
// 时间 // 时间
timer: null, timer: null,
is_sendcode: false, // 60s is_sendcode: false, // 60s
time_count: 60, time_count: 60,
consentPact: true,
pactList: [{
"text": "《用户协议》"
},{
"text":"《隐私政策》"
}]
}; };
}, },
methods: { methods: {
@ -106,6 +91,14 @@ export default {
changetab(num){ changetab(num){
this.state = num this.state = num
}, },
// 选中某个复选框时，由checkbox时触发
checkboxChange(e) {
//console.log(e);
},
// 选中任一checkbox时，由checkbox-group触发
checkboxGroupChange(e) {
// console.log(e);
},
mask_u() { mask_u() {
this.show = !this.show; this.show = !this.show;
}, },
@ -145,34 +138,17 @@ export default {
// console.log(this.$u.trim(this.zhanghaoA)); // console.log(this.$u.trim(this.zhanghaoA));
}, },
logins() { logins() {
// 检查网络
uni.getNetworkType({
success: (res) => {
console.log(res.networkType);
if (res.networkType == 'none') {
this.$refs.uToast.show({
title: '网络似乎断开了，请检查网络后重试',
type: 'error'
});
}
},
});
// 不同意协议不让登录
if(!this.consentPact) return false;
// 判断是否可以点击 // 判断是否可以点击
// console.log(this.zhanghao); // console.log(this.zhanghao);
// if(this.clickstate==false){ if(this.clickstate==false){
// this.clickstate=true this.clickstate=true
// }else{ }else{
// 此验证存在逻辑问题,会出现卡死在这里的情况 this.$refs.uToast.show({
// this.$refs.uToast.show({ title: "不能重复提交",
// title: "不能重复提交", type: 'error'
// type: 'error' });
// }); return
// return }
// }
// 清除本地存储才可以正常登陆（具体原因没有仔细检查） // 清除本地存储才可以正常登陆（具体原因没有仔细检查）
// uni.clearStorage(); // uni.clearStorage();
// 账号登录1达人0商家 // 账号登录1达人0商家
@ -181,7 +157,7 @@ export default {
console.log(JSON.stringify(res)) console.log(JSON.stringify(res))
if (res.errCode != 0) { if (res.errCode != 0) {
// 恢复按钮可点击状态 // 恢复按钮可点击状态
// this.clickstate=false this.clickstate=false
this.$refs.uToast.show({ this.$refs.uToast.show({
title: res.message, title: res.message,
type: 'error' type: 'error'
@ -232,7 +208,7 @@ export default {
console.log(JSON.stringify(res)) console.log(JSON.stringify(res))
if (res.errCode != 0) { if (res.errCode != 0) {
// 恢复按钮可点击状态 // 恢复按钮可点击状态
// this.clickstate=false this.clickstate=false
this.$refs.uToast.show({ this.$refs.uToast.show({
title: res.message, title: res.message,
type: 'error' type: 'error'
@ -241,13 +217,10 @@ export default {
uni.setStorageSync('token', res.data.token); uni.setStorageSync('token', res.data.token);
uni.setStorageSync('userinfo', res.data); uni.setStorageSync('userinfo', res.data);
uni.setStorageSync('rongyun', res.data.rongcloud_token); uni.setStorageSync('rongyun', res.data.rongcloud_token);
// this.$u.route({ this.$u.route({
// url: '/pages/index/index', url: '/pages/index/index',
// type: 'switchTab' type: 'switchTab'
// }); });
uni.switchTab({
url: '/pages/index/index',
})
} }
}); });
} }
@ -271,28 +244,7 @@ export default {
}, },
moveHandle(){ moveHandle(){
return; return;
}, }
viewAgreement(index) {
console.log(index);
if (index == 0) {
this.$u.route({
url: '/pages/login/agreements',
params: {
title: "用户协议"
}
});
}
if (index == 1) {
this.$u.route({
url: '/pages/login/privacy_policy',
params: {
title: "隐私政策"
}
});
}
}
}, },
onLoad() { onLoad() {
let token = uni.getStorageSync('token'); let token = uni.getStorageSync('token');
@ -304,7 +256,7 @@ export default {
type: user.role == 2 ? 'tab' : 'to' type: user.role == 2 ? 'tab' : 'to'
}); });
} }
}, }
}; };
</script> </script>
@ -371,7 +323,7 @@ export default {
.title { .title {
font-size: 36rpx; font-size: 36rpx;
font-weight: bold; font-weight: bold;
margin-bottom: 120rpx; margin-bottom: 150rpx;
color: #fff; color: #fff;
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
@ -415,14 +367,9 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
height: 90rpx; height: 90rpx;
margin-bottom: 160rpx;
line-height: 90rpx; line-height: 90rpx;
border-bottom: 1px #fff solid; border-bottom: 1px #fff solid;
&:first-child {
margin-bottom: 100rpx;
}
&:nth-child(2) {
margin-bottom: 80rpx;
}
input { input {
width: 80%; width: 80%;
margin-left: 30rpx; margin-left: 30rpx;
@ -459,27 +406,27 @@ export default {
letter-spacing: 2rpx; letter-spacing: 2rpx;
} }
.pact text {
font-size: 22rpx;
font-weight: 400;
color: rgba(255, 255, 255, 1);
line-height: 36px;
}
.pact_text {
font-size: 22px;
font-weight: 400;
color: rgba(129, 188, 253, 1) !important;
line-height: 36px;
}
//单选框的样式
.pact { .pact {
width: 670rpx; position: relative;
margin: 0 auto 40rpx; padding-left: 40rpx;
font-size: 26rpx;
overflow: hidden; //超出的文本隐藏 overflow: hidden; //超出的文本隐藏
text-overflow: ellipsis; //溢出用省略号显示 text-overflow: ellipsis; //溢出用省略号显示
white-space: nowrap; //溢出不换行 white-space: nowrap; //溢出不换行
.pact-container {
display: flex;
justify-content: flex-end;
align-items: center;
flex-wrap: wrap;
/deep/ .u-checkbox {
.u-checkbox__label {
margin-right: 0;
}
}
.pact-items {
color: rgba(255, 120, 15, 1);
}
}
} }
.u-checkbox-group { .u-checkbox-group {

37
pages/login/privacy_policy.vue
View File

File diff suppressed because one or more lines are too long

29
pages/release/video.vue
View File

@ -42,7 +42,7 @@
<view class="titles">正文</view> <view class="titles">正文</view>
<view class="titles_border"><textarea placeholder="请输入内容..." v-model="form.intro"></textarea></view> <view class="titles_border"><textarea placeholder="请输入内容..." v-model="form.intro"></textarea></view>
<view class="show_two"> <view class="show_two">
<u-popup v-model="show_two" mode="bottom" @close="closeGood" :closeable="true"> <u-popup v-model="show_two" mode="bottom" :closeable="true">
<view class="title"><text>选择商品</text></view> <view class="title"><text>选择商品</text></view>
<!-- 商品列表 --> <!-- 商品列表 -->
<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll"> <scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll">
@ -61,7 +61,7 @@
<view class="u-button" @click="changes()">确定</view> <view class="u-button" @click="changes()">确定</view>
</u-popup> </u-popup>
<!-- 底部选择商品列表 --> <!-- 底部选择商品列表 -->
<view @click="selectGoods" v-if="userinfo.role != 4"> <view @click="show_two = true" v-if="userinfo.role != 4">
选择商品 选择商品
<image class="images" src="../../static/image/tosign/bhottom.png"></image> <image class="images" src="../../static/image/tosign/bhottom.png"></image>
</view> </view>
@ -91,18 +91,11 @@ let COS = require('../../common/cos-wx-sdk-v5.js');
const upload_file_server = (_this, filepath) => { const upload_file_server = (_this, filepath) => {
// 腾讯云配置 // 腾讯云配置
let cosConfig = { let cosConfig = {
Bucket: 'dmmall-1302895943', //replace with yours Bucket: 'dmmall-1300406074', //replace with yours
Region: 'ap-shanghai', //replace with yours Region: 'ap-shanghai', //replace with yours
SecretId: 'AKID7z1lFeo0tV9YmmvZ52mrxlNmvqHTcuCF', //replace with yours SecretId: 'AKIDjDPJhni9gTzEB9iGNWQ3PTVGjv74q7EL', //replace with yours
SecretKey: 'd3zTJ0RFwMYVE7jAMJzQ4UbS4YmmJiPq' //replace with yours SecretKey: 'ye3SZOvAQO5X5LK3Vy933h6G86h4mqpG' //replace with yours
}; };
// 腾讯云配置
// let cosConfig = {
// Bucket: 'dmmall-1300406074', //replace with yours
// Region: 'ap-shanghai', //replace with yours
// SecretId: 'AKIDjDPJhni9gTzEB9iGNWQ3PTVGjv74q7EL', //replace with yours
// SecretKey: 'ye3SZOvAQO5X5LK3Vy933h6G86h4mqpG' //replace with yours
// };
// 获取本地文件 // 获取本地文件
let filePath = filepath; let filePath = filepath;
// 自定义文件名以及路径 // 自定义文件名以及路径
@ -132,7 +125,7 @@ const upload_file_server = (_this, filepath) => {
console.log(err, data, 12345); console.log(err, data, 12345);
if (err == null) { if (err == null) {
if (data.statusCode == 200) { if (data.statusCode == 200) {
_this.videopath = 'https://dmmall-1302895943.cos.ap-shanghai.myqcloud.com/' + Key; _this.videopath = 'https://dmmall-1300406074.cos.ap-shanghai.myqcloud.com/' + Key;
uni.hideLoading(); uni.hideLoading();
_this.videostate = true; _this.videostate = true;
} else { } else {
@ -153,7 +146,6 @@ const cImage = _this => {
count: 1, count: 1,
sourceType: ['camera', 'album'], sourceType: ['camera', 'album'],
success: function(res) { success: function(res) {
// _this.is_video = true;
uni.showLoading({ uni.showLoading({
title: '上传中' title: '上传中'
}); });
@ -294,15 +286,6 @@ export default {
this.selectarr.push(this.fileListes[num].id); this.selectarr.push(this.fileListes[num].id);
} }
}, },
// 选择商品
selectGoods() {
this.show_two = true;
this.is_video = true;
},
// 选择商品弹窗关闭
closeGood() {
this.is_video = false;
},
// 创建标签 // 创建标签
addLiveSpec() { addLiveSpec() {
this.$u.api.createLivesp({ this.$u.api.createLivesp({

10
pages/release/zhibo.nvue
View File

@ -139,8 +139,8 @@
font-size: 30rpx; font-size: 30rpx;
color:#fff; color:#fff;
width: 350rpx; width: 350rpx;
position: absolute; position: absolute;
top: 70rpx; top: 70rpx;
left: 31rpx; left: 31rpx;
height: 31rpx; height: 31rpx;
} }
@ -234,9 +234,7 @@
border-bottom-width: 2rpx; border-bottom-width: 2rpx;
border-style: solid; border-style: solid;
border-color: #ECECEC; border-color: #ECECEC;
/* #ifndef APP-PLUS-NVUE */
display: flex; display: flex;
/* #endif */
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
} }
@ -271,9 +269,7 @@
border-bottom-width: 2rpx; border-bottom-width: 2rpx;
border-style: solid; border-style: solid;
border-color: #ECECEC; border-color: #ECECEC;
/* #ifndef APP-PLUS-NVUE */
display: flex; display: flex;
/* #endif */
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
@ -351,9 +347,7 @@
font-size: 30rpx; font-size: 30rpx;
color: #fff; color: #fff;
flex-direction: column-reverse; flex-direction: column-reverse;
/* #ifndef APP-PLUS-NVUE */
word-wrap:anywhere; word-wrap:anywhere;
/* #endif */
font-weight: bold; font-weight: bold;
} }
.livePusher{ .livePusher{

2
pages/user/contentDetails.vue
View File

@ -36,7 +36,7 @@
<view class="name">{{item.member_nickname}}{{item.reply_member_nickname==null?"评论了文章":" 回复了 "+item.reply_member_nickname}}</view> <view class="name">{{item.member_nickname}}{{item.reply_member_nickname==null?"评论了文章":" 回复了 "+item.reply_member_nickname}}</view>
<view class="time">{{item.create_time}}</view> <view class="time">{{item.create_time}}</view>
</view> </view>
<view class="btn" @click="showreply(item.id,item.member_id)" v-if="item.pid==0">回复</view> <view class="btn" @click="showreply(item.id,item.member_id)">回复</view>
</view> </view>
<view class="content u-line-1">{{item.content}}</view> <view class="content u-line-1">{{item.content}}</view>
</view> </view>

117
pages/user/feedback.vue
View File

@ -1,117 +0,0 @@
<template>
<view class="write-complaints">
<view class="main-container">
<view class="text-box">
<u-input class="textarea" placeholder="发表您的意见吧，我们会做得更好。 (必填)" v-model="text" type="textarea" :clearable="false" :maxlength="200" />
<span class="text-length">{{ text.length }}/200</span>
</view>
<u-input class="phone" placeholder="请输入手机号方便联系 (非必填)" v-model="phone" type="number" />
</view>
<view class="write-btn" @click="submit">发表意见</view>
<u-toast ref="uToast" />
</view>
</template>
<script>
export default {
data() {
return {
phone: '',
text: '',
}
},
methods: {
submit() {
if(!this.verifyContent()) return false;
// console.log(this.phone);
// console.log(this.text);
this.$u.toast('提交成功');
this.phone = "";
this.text = "";
},
verifyContent() {
if(this.$u.test.isEmpty(this.text)) {
this.$u.toast('内容不可为空');
return false;
}
if(!this.$u.test.isEmpty(this.phone)) {
if(!this.$u.test.mobile(this.phone)) {
this.$u.toast('手机格式错误');
return false;
}
}
return true;
},
writeFeedback() {
if(!this.verifyContent()) return false;
this.$u.api.writeFeedback({
fb_content: this.text,
fb_images: this.imageList,
}).then(res => {
if(res.errCode == 0) {
this.$refs.uToast.show({
title: res.message,
duration: 2000,
callback:() => {
this.$u.route({
type: "navigateBack",
url: '/pageE/more/Complaints',
})
}
})
} else {
this.$u.toast(res.message);
}
})
},
},
}
</script>
<style lang="scss" scoped>
.write-complaints {
min-height: calc(100vh - var(--window-top));
background-color: #ECECEC;
.main-container {
background-color: #ffffff;
.text-box {
padding-bottom: 60rpx;
position: relative;
&::after {
content: "";
position: absolute;
bottom: 0;
left: 0;
height: 3rpx;
width: 750rpx;
background-color: #ECECEC;
}
.text-length {
height: 60rpx;
position: absolute;
right: 40rpx;
bottom: 0;
color: #999;
}
}
/deep/ .textarea {
padding: 0 30rpx !important;
width: 100% !important;
margin-bottom: 10rpx;
}
/deep/ .phone {
padding: 20rpx 30rpx !important;
}
}
.write-btn {
margin: 120rpx auto 0;
width: 690rpx;
height: 98rpx;
background: rgba(255,120,15,1);
border-radius: 46rpx;
font-size: 36rpx;
color: rgba(255,255,255,1);
text-align: center;
line-height: 98rpx;
}
}
</style>

52
pages/user/index.vue
View File

@ -23,20 +23,6 @@
<text>骑手投诉</text> <text>骑手投诉</text>
<image src="/static/image/user/1.png"></image> <image src="/static/image/user/1.png"></image>
</view> </view>
<view class="nav" @click="toOthersPage('feedback')">
<text>用户反馈</text>
<image src="/static/image/user/1.png"></image>
</view>
<view class="nav" @click="viewAgreement(0)">
<text>用户协议</text>
<image src="/static/image/user/1.png"></image>
</view>
<view class="nav" @click="viewAgreement(1)">
<text>隐私政策</text>
<image src="/static/image/user/1.png"></image>
</view>
<view class="nav" @click="clearCache"> <view class="nav" @click="clearCache">
<text>清除缓存</text> <text>清除缓存</text>
<text>{{ fileSizeString }}</text> <text>{{ fileSizeString }}</text>
@ -64,17 +50,18 @@ export default {
watch: { watch: {
isLoginOut() { isLoginOut() {
// console.log(this.isLoginOut); // console.log(this.isLoginOut);
// if (this.isLoginOut) { if (this.isLoginOut) {
// uni.hideTabBar(); uni.hideTabBar();
// } else { } else {
// setTimeout(function() { setTimeout(function() {
// uni.showTabBar(); uni.showTabBar();
// },200) },200)
// } }
} }
}, },
onLoad() { onLoad() {
this.getCache(); this.getCache();
console.log(222);
}, },
onShow() { onShow() {
this.getmyinfo() this.getmyinfo()
@ -114,8 +101,8 @@ export default {
plus.cache.clear(function(e) { plus.cache.clear(function(e) {
console.log(e); console.log(e);
}) })
this.getCache();
} }
this.getCache();
} }
}) })
// #endif // #endif
@ -152,26 +139,7 @@ export default {
uni.navigateTo({ uni.navigateTo({
url: '/pages/user/' + url url: '/pages/user/' + url
}); });
}, }
viewAgreement(index) {
if (index == 0) {
this.$u.route({
url: '/pages/login/agreements',
params: {
title: "用户协议"
}
});
}
if (index == 1) {
this.$u.route({
url: '/pages/login/privacy_policy',
params: {
title: "隐私政策"
}
});
}
}
}, },
} }
</script> </script>

24
pages/user/info.vue
View File

@ -5,8 +5,7 @@
<text>更换头像</text> <text>更换头像</text>
</view> </view>
<view class="item"> <view class="item">
<text class="title" v-if="role == 2">店铺名称</text> <text class="title">用户名</text>
<text class="title" v-else>达人名称</text>
<input type="text" value="" v-model="info.member_nickname" placeholder="请输入用户名"/> <input type="text" value="" v-model="info.member_nickname" placeholder="请输入用户名"/>
</view> </view>
<view class="item"> <view class="item">
@ -38,7 +37,6 @@ export default {
this.role = userinfo.role; this.role = userinfo.role;
// console.log(this.role); // console.log(this.role);
}, },
// 保存信息
onNavigationBarButtonTap() { onNavigationBarButtonTap() {
let that = this; let that = this;
let obj ={ let obj ={
@ -88,13 +86,7 @@ export default {
}, },
// 获取图片,上传图片 // 获取图片,上传图片
chooseImage(sourceType) { chooseImage(sourceType) {
let that = this; let that = this
let photo_type = "";
if (this.role == 2) {
photo_type = "store_avatar"
} else {
photo_type = "avatar"
}
const token = uni.getStorageSync('token'); const token = uni.getStorageSync('token');
uni.chooseImage({ uni.chooseImage({
count: 1, count: 1,
@ -105,24 +97,20 @@ export default {
uni.uploadFile({ uni.uploadFile({
url: 'https://mall.dmygkeji.com/storeapi/Upload/uploadFile', url: 'https://mall.dmygkeji.com/storeapi/Upload/uploadFile',
filePath: tempFilePaths[0], filePath: tempFilePaths[0],
name: photo_type, name: 'avatar',
formData:{ formData:{
name: photo_type, name:"avatar"
store_id: that.info.store_id
}, },
header:{ header:{
Authorization:'Bearer' + " " + token Authorization:'Bearer' + " " + token
}, },
success: uploadFileRes => { success: uploadFileRes => {
let obj = JSON.parse(uploadFileRes.data) let obj = JSON.parse(uploadFileRes.data)
that.fileurl = obj.data.file_path+'?'+new Date().getTime() that.fileurl = obj.data.file_path
that.filename = obj.data.file_name that.filename = obj.data.file_name
that.num++ that.num++
console.log(that.fileurl,that.filename) console.log(that.fileurl,that.filename)
}, }
fail: (res) => {
console.log(res);
}
}); });
} }
}); });

14
pages/user/myinfo.vue
View File

@ -2,7 +2,7 @@
<view class="user"> <view class="user">
<view class="head" @click="toOthersPage('info')"> <view class="head" @click="toOthersPage('info')">
<view class="info"> <view class="info">
<image :src="info.member_avatar + '?' + (new Date().getTime())"></image> <image :src="info.member_avatar"></image>
<view class="name"> <view class="name">
<text>{{info.member_nickname==null?"新用户":info.member_nickname}}</text> <text>{{info.member_nickname==null?"新用户":info.member_nickname}}</text>
<text>账号：{{info.member_name}}</text> <text>账号：{{info.member_name}}</text>
@ -111,12 +111,12 @@ export default {
confirmColor: "#f00", confirmColor: "#f00",
success: (res) => { success: (res) => {
// console.log(res); // console.log(res);
if (res.confirm) { if (res.confirm) {
plus.cache.clear(function(e) { plus.cache.clear(function(e) {
console.log(e); console.log(e);
}) })
this.getCache(); }
} this.getCache();
} }
}) })
// #endif // #endif

2
static/chatservice.js
View File

@ -62,7 +62,7 @@ function ChatRoomService(room, user) {
//获取实例 //获取实例
ChatRoomService.prototype.connectGoEasyIM = function () { ChatRoomService.prototype.connectGoEasyIM = function () {
this.im = GoEasyIM.getInstance({ this.im = GoEasyIM.getInstance({
appkey: 'BC-d9b5e639006b4ee2a4bc9eddc4235a6a', appkey: 'BC-453aa755c4ea48148abefc55a86df283',
host: 'hangzhou.goeasy.io' host: 'hangzhou.goeasy.io'
}); });