更换

components/order-item/index.vue

@@ -14,13 +14,12 @@
 				<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==7">商家拒绝</view>
-				<view class="status" v-else-if="info.view_type==10">待支付订单</view>
 			</view>
 			<view class="name u-line-1">{{info.extend_order_goods[0].goods_name}}</view>
 			<view class="info">
 				<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>

pages.json

@@ -313,5 +313,6 @@
 			"text": "我的",
 			"selectedColor": "#FBFBFB"
 		}]
+
 	}
 }

pages/index/details.vue

@@ -23,7 +23,7 @@
 					<view class="info">
 						<view class="num">共{{ list.goods_num }}件商品</view>
 						<view class="price">
-                            {{ type == 10 ? "待支付" : "实付" }}
+							实付
 							<span>￥{{ list.goods_pay_price }}</span>
 						</view>
 					</view>
@@ -146,38 +146,6 @@
 		<view class="refund" v-if="type == 5 ">退款状态:同意退款，请注意查收！</view>
 		<view class="refund" v-if="type == 6 ">退款状态:商家同意退款，等待后台处理！</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">
 			<view class="title">骑手信息</view>
 			<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 {
 		flex: 1;
 		background-color: #ffffff;

pages/index/index.vue

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

pages/login/login.vue

@@ -217,13 +217,10 @@ export default {
 						uni.setStorageSync('token', res.data.token);
 						uni.setStorageSync('userinfo', res.data);
 						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',
-                        })
 					}
 				});
 			}

pages/release/video.vue

@@ -42,7 +42,7 @@
 			<view class="titles">正文</view>
 			<view class="titles_border"><textarea placeholder="请输入内容..." v-model="form.intro"></textarea></view>
 			<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>
 					<!-- 商品列表 -->
 					<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll">
@@ -61,7 +61,7 @@
 					<view class="u-button" @click="changes()">确定</view>
 				</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>
 				</view>
@@ -146,7 +146,6 @@ const cImage = _this => {
 		count: 1,
 		sourceType: ['camera', 'album'],
 		success: function(res) {
-            // _this.is_video = true;
 			uni.showLoading({
 				title: '上传中'
 			});
@@ -287,15 +286,6 @@ export default {
 				this.selectarr.push(this.fileListes[num].id);
 			}
 		},
-        // 选择商品
-        selectGoods() {
-            this.show_two = true;
-            this.is_video = true;
-        },
-        // 选择商品弹窗关闭
-        closeGood() {
-            this.is_video = false;
-        },
 		// 创建标签
 		addLiveSpec() {
 			this.$u.api.createLivesp({

pages/user/index.vue

@@ -50,17 +50,18 @@ export default {
     watch: {
         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() {
         this.getCache();
+        console.log(222);
 	},
 	onShow() {
 		this.getmyinfo()
@@ -100,8 +101,8 @@ export default {
                         plus.cache.clear(function(e) {
                             console.log(e);
                         })
-                        this.getCache();
                     }
+                    this.getCache();
                 }
             })
             // #endif

pages/user/info.vue

@@ -5,7 +5,7 @@
 			<text>更换头像</text>
 		</view>
 		<view class="item">
-			<text class="title">店铺名称</text>
+			<text class="title">用户名</text>
 			<input type="text" value="" v-model="info.member_nickname" placeholder="请输入用户名"/>
 		</view>
 		<view class="item">
@@ -37,7 +37,6 @@ export default {
         this.role = userinfo.role;
         // console.log(this.role);
 	},
-    // 保存信息
 	onNavigationBarButtonTap() {
 		let that = this;
 		let obj ={
@@ -87,13 +86,7 @@ export default {
 		},
 		// 获取图片,上传图片
 		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');
 			uni.chooseImage({
 				count: 1,
@@ -104,10 +97,9 @@ export default {
 					uni.uploadFile({
 						url: 'https://mall.dmygkeji.com/storeapi/Upload/uploadFile',
 						filePath: tempFilePaths[0],
-						name: photo_type,
+						name: 'avatar',
 						formData:{
-							name: photo_type,
+							name:"avatar"
-                            store_id: that.info.store_id
 						},
 						header:{
 							Authorization:'Bearer' + " " + token
@@ -118,10 +110,7 @@ export default {
 							that.filename =  obj.data.file_name
 							that.num++
 							console.log(that.fileurl,that.filename)
-						},
+						}
-                        fail: (res) => {
-                            console.log(res);
-                        }
 					});
 				}
 			});

pages/user/myinfo.vue

@@ -111,12 +111,12 @@ export default {
 						confirmColor: "#f00",
 						success: (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

static/imservice.js

@@ -36,7 +36,7 @@ function CurrentUser(uuid, name, avatar) {
 function IMService() {
     this.im = GoEasyIM.getInstance({
         host:'hangzhou.goeasy.io',//qos=1
-        appkey:'BC-453aa755c4ea48148abefc55a86df283'
+        appkey:'BC-d9b5e639006b4ee2a4bc9eddc4235a6a'
     });
     //当前“我”
     this.currentUser = null;