Merge pull request 'gdpao' (#110) from gyh into master

Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/110

components/order-item/index.vue

@@ -14,7 +14,7 @@
 				<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 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">

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>

pages/user/index.vue

@@ -61,7 +61,6 @@ export default {
     },
 	onLoad() {
         this.getCache();
-        console.log(222);
 	},
 	onShow() {
 		this.getmyinfo()

pages/user/info.vue

@@ -87,7 +87,13 @@ 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,
@@ -98,9 +104,10 @@ export default {
 					uni.uploadFile({
 						url: 'https://mall.dmygkeji.com/storeapi/Upload/uploadFile',
 						filePath: tempFilePaths[0],
-						name: 'avatar',
+						name: photo_type,
 						formData:{
-							name:"avatar"
+							name: photo_type,
+                            store_id: that.info.store_id
 						},
 						header:{
 							Authorization:'Bearer' + " " + token
@@ -111,6 +118,9 @@ export default {
 							that.filename =  obj.data.file_name
 							that.num++
 							console.log(that.fileurl,that.filename)
+						},
+                        fail: (res) => {
+                            console.log(res);
                         }
 					});
 				}