From a811147c6b777316a7cb042f52d2e86e586ca1cf Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Fri, 29 Oct 2021 10:21:41 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8E=BB=E6=8E=89=E6=89=80=E6=9C=89console?=
 =?UTF-8?q?=E5=92=8C=E6=9B=BF=E6=8D=A2=E6=89=80=E6=9C=89=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E6=8D=A2=E6=88=90=E8=B4=A1=E7=8C=AE=E5=80=BC]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                  |    1 -
 apis/interfaces/withdraws.js             |    2 +-
 pages.json                               |    2 +-
 pages/company/approve.vue                |    1 -
 pages/coupons/add.vue                    |    1 -
 pages/coupons/management.vue             |    1 -
 pages/equity/index.vue                   |    1 -
 pages/found/index.vue                    |   18 +-
 pages/found/task.vue                     |    1 -
 pages/goods/add.vue                      |    1 -
 pages/goods/confirmOrder.vue             |    1 -
 pages/goods/goodsAuth.vue                |    1 -
 pages/goods/management.vue               |    1 -
 pages/index/index.vue                    |   12 +-
 pages/user/address/create.vue            |    1 -
 pages/user/address/list.vue              |    2 -
 pages/user/code.vue                      |    2 +-
 pages/user/index.vue                     |    7 +-
 pages/user/order/logistics.vue           |    3 -
 pages/user/order/mallRefund.vue          |  598 +++++-----
 pages/user/order/mallRefundsInfo.vue     |    2 -
 pages/user/order/mallShipments.vue       |    8 -
 pages/user/order/mallShipmentsInfo.vue   | 1308 +++++++++++-----------
 pages/user/order/mallShipmentsRefund.vue |    9 -
 pages/user/order/numberWeight.vue        |    1 -
 pages/user/order/numberWeightInfo.vue    |    3 -
 pages/user/order/servicesOrder.vue       |    2 -
 pages/user/order/servicesOrderInfo.vue   |    4 -
 pages/verification/history.vue           |    3 -
 pages/verification/index.vue             |    8 -
 pages/vip/examine.vue                    |    1 -
 pages/vip/vip.vue                        |    2 -
 pages/wallet/addBank.vue                 |    4 -
 pages/wallet/bankList.vue                |    3 -
 pages/wallet/extractRed.vue              |    1 -
 pages/wallet/fragment.vue                |    4 +-
 pages/wallet/property.vue                |    1 -
 pages/wallet/redProperty.vue             |    3 -
 pages/wallet/withdrawList.vue            |    3 +-
 39 files changed, 990 insertions(+), 1037 deletions(-)

diff --git a/App.vue b/App.vue
index f82f146..18ea07b 100644
--- a/App.vue
+++ b/App.vue
@@ -7,7 +7,6 @@
 					} else {
 						document.addEventListener('WeixinJSBridgeReady', handleFontSize, false);
 					}
-
 					function handleFontSize() {
 						// 设置网页字体为默认大小
 						WeixinJSBridge.invoke('setFontSizeCallback', {
diff --git a/apis/interfaces/withdraws.js b/apis/interfaces/withdraws.js
index dbe36dc..813aad1 100644
--- a/apis/interfaces/withdraws.js
+++ b/apis/interfaces/withdraws.js
@@ -82,7 +82,7 @@ const withdrawsIndexLists = (data) => {
 	})
 }
 
-// 积分记录
+// 贡献值记录
  const userAccoutScores = (data) => {
  	return request({
  		url: 'user/account/scores',
diff --git a/pages.json b/pages.json
index 0c7b571..ec64263 100644
--- a/pages.json
+++ b/pages.json
@@ -547,7 +547,7 @@
 			"path": "pages/wallet/fragment",
 			"name": "Fragment",
 			"style": {
-				"navigationBarTitleText": "积分记录",
+				"navigationBarTitleText": "贡献值记录",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#774ffd",
 				"navigationBarTextStyle": "white"
diff --git a/pages/company/approve.vue b/pages/company/approve.vue
index 12cf46b..bc693e1 100644
--- a/pages/company/approve.vue
+++ b/pages/company/approve.vue
@@ -144,7 +144,6 @@
 						})
 					})
 				} else {
-					console.log('11', res)
 					this.getAppliesCategory(res.industries[0].industry_id)
 				}
 			}).catch(err => {
diff --git a/pages/coupons/add.vue b/pages/coupons/add.vue
index 8af246e..52a73d4 100644
--- a/pages/coupons/add.vue
+++ b/pages/coupons/add.vue
@@ -225,7 +225,6 @@
 					days			: this.timeNumber,
 					goodsable_ids	: this.coupongoods
 				}
-				console.log(valuss.time_type)
 				pushCoupons(valuss).then(res => {
 					uni.showModal({
 						title		: '提示',
diff --git a/pages/coupons/management.vue b/pages/coupons/management.vue
index 06619c0..b688e86 100644
--- a/pages/coupons/management.vue
+++ b/pages/coupons/management.vue
@@ -86,7 +86,6 @@
 					type	: this.listType,
 					status	: this.tabsType
 				}).then(res => {
-					console.log(res)
 					this.coupons = res.lists.data
 					this.pages = res.lists.page
 				}).catch(err => {
diff --git a/pages/equity/index.vue b/pages/equity/index.vue
index 67b60a7..e0916c3 100644
--- a/pages/equity/index.vue
+++ b/pages/equity/index.vue
@@ -395,7 +395,6 @@
 			},
 			// 易货分类
 			onClassify(id) {
-				console.log(id)
 				// this.$Router.push({
 				// 	name: 'goodsList'
 				// })
diff --git a/pages/found/index.vue b/pages/found/index.vue
index 9e7315b..dc6bd12 100644
--- a/pages/found/index.vue
+++ b/pages/found/index.vue
@@ -9,7 +9,7 @@
 					签到成功
 				</view>
 				<view class="signPop-cont-text">
-					积分<view class="signPop-cont-number">+{{sign.signSuccess}}</view>
+					贡献值<view class="signPop-cont-number">+{{sign.signSuccess}}</view>
 				</view>
 			</view>
 		</view>
@@ -17,7 +17,7 @@
 		<!-- 签到 -->
 		<view class="signCont">
 			<view class="content-title">发现更多</view>
-			<view class="content-sumite">海量积分等你解锁</view>
+			<view class="content-sumite">海量贡献值等你解锁</view>
 			<view class="sign">
 				<view class="sign-list" :class="{ active: item.sign }" v-for="(item, index) in sign.signArr"
 					:key="index">
@@ -39,25 +39,25 @@
 					</view>
 				</view>
 			</view>
-			<view class="sign-record">再签到{{ sign.nextTask.day }}天额外赠送{{ sign.nextTask.diff }}个积分</view>
+			<view class="sign-record">再签到{{ sign.nextTask.day }}天额外赠送{{ sign.nextTask.diff }}个贡献值</view>
 		</view>
 		<view class="signBtn">
 			<block v-if="sign.signCan">
 				<view class="signBtn-go" @click="signClick" style="cursor:pointer">
 					<u-icon name="calendar-fill" color="#333" size="40" />
-					签到领取积分
+					签到领取贡献值
 				</view>
 			</block>
 			<block v-else>
 				<view class="signBtn-go" @click="$Router.push({name:'Fragment'})">
-					积分记录<image class="signBtn-go-icon" src="/static/user/sign_arrow.png" mode="aspectFill"></image>
+					贡献值记录<image class="signBtn-go-icon" src="/static/user/sign_arrow.png" mode="aspectFill"></image>
 				</view>
 			</block>
 		</view>
 		<!-- 水晶任务 -->
 		<view class="task">
 			<view class="task-liest">
-				积分任务
+				贡献值任务
 			</view>
 			<block v-for="(item, index) in task" :key="index">
 				<view class="task-item" v-if="item.rule.name != 'sign_crystal'"
@@ -99,7 +99,7 @@
 					tipsContent: '', // 弹出的动态内容
 					tipsState: false // 弹出的动态状态
 				},
-				energyShard: '' // 积分说明
+				energyShard: '' // 贡献值说明
 			}
 		},
 		onShow() {
@@ -144,10 +144,10 @@
 				})
 			},
 
-			// 积分提示信息
+			// 贡献值提示信息
 			showHelp() {
 				uni.showModal({
-					title: '积分',
+					title: '贡献值',
 					confirmColor: '#8b64fd',
 					content: this.energyShard.description,
 					showCancel: false
diff --git a/pages/found/task.vue b/pages/found/task.vue
index b674d50..76a7859 100644
--- a/pages/found/task.vue
+++ b/pages/found/task.vue
@@ -21,7 +21,6 @@
             taskInfo() {
             	// 领取水晶
             	thawlog().then(res => {
-            		console.log(res)
             	}).catch(err => {
             		uni.showToast({
             			icon: 'none',
diff --git a/pages/goods/add.vue b/pages/goods/add.vue
index 4801be9..f474829 100644
--- a/pages/goods/add.vue
+++ b/pages/goods/add.vue
@@ -419,7 +419,6 @@
 							}
 							if(authRes.confirm){
 								let goodsId = this.$Route.query.type === 'edit' ? this.$Route.query.id : res
-                                console.log(goodsId)
 								this.$Router.push({name: 'goodsAddAuth', params: { id: goodsId , type: 'goodsAdd', edit: this.$Route.query.type === 'edit'}})
 							}
 						}
diff --git a/pages/goods/confirmOrder.vue b/pages/goods/confirmOrder.vue
index 054aead..91ff876 100644
--- a/pages/goods/confirmOrder.vue
+++ b/pages/goods/confirmOrder.vue
@@ -205,7 +205,6 @@
 									}, 3000);
 								},
 								fail: (err) => {
-									console.log('payerr', err)
 									uni.showToast({
 										title: '支付失败',
 										duration: 3000,
diff --git a/pages/goods/goodsAuth.vue b/pages/goods/goodsAuth.vue
index 2c6c395..963cee7 100644
--- a/pages/goods/goodsAuth.vue
+++ b/pages/goods/goodsAuth.vue
@@ -96,7 +96,6 @@
 		methods: {
 			// picker选择
 			pickerChange(e, key){
-				console.log(key,e.detail.value)
 				this[key] = e.detail.value
 			},
 			// 图片预览
diff --git a/pages/goods/management.vue b/pages/goods/management.vue
index 38f4f10..843d88f 100644
--- a/pages/goods/management.vue
+++ b/pages/goods/management.vue
@@ -127,7 +127,6 @@
 					cancelText	: '确定',
 					success		: res => {
 						if(res.confirm){
-							console.log(res.confirm)
 							this.$Router.push({name: 'goodsAdd', params: {type: 'edit', id}})
 						}
 					}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ec71118..fe60332 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -9,7 +9,7 @@
 					<image src="@/static/icons/gemstone-icon.png" />{{isAuth ? '通证' + account.coin : '查看通证'}}
 				</view>
 				<view class="item nowrap" @click="navAccount('Fragment')">
-					<image src="@/static/icons/crystal-icon.png" />{{isAuth ? '积分' + account.crystal : '查看积分'}}
+					<image src="@/static/icons/crystal-icon.png" />{{isAuth ? '贡献值' + account.crystal : '查看贡献值'}}
 				</view>
 			</view>
 		</view>
@@ -58,7 +58,7 @@
 					<image :src="item.cover" />
 				</view>
 				<view class="title nowrap">{{item.title}}</view>
-				<view class="submit-title nowrap">积分{{item.tips}}</view>
+				<view class="submit-title nowrap">贡献值{{item.tips}}</view>
 			</view>
 		</scroll-view>
 		<!-- 平台概况 -->
@@ -86,7 +86,7 @@
 					<view class="number nowrap">{{chains.up}}</view>
 				</view>
 				<view class="header-item">
-					<view class="title">昨日瓜分积分
+					<view class="title">昨日瓜分贡献值
 						<uni-icons class="help-icon" @click="showHelp('score')" type="help-filled" size="15"
 							color="rgba(255,255,255,.3)" />
 					</view>
@@ -174,9 +174,6 @@
 			},
 			// 查看钱包账户
 			navAccount(pathName) {
-
-				console.log(1111)
-
 				if (!this.isAuth) {
 					this.$Router.push({
 						name: 'Login'
@@ -217,7 +214,6 @@
 					success: res => {
 						if (res.confirm) {
 							if (pathName === 'vipIndex') {
-								console.log(this.userAuth.identity)
 								this.$Router.push({
 									name: 'vipIndex',
 									params: {
@@ -234,7 +230,7 @@
 					}
 				})
 			},
-			// 领取积分
+			// 领取贡献值
 			ledCrystal(index) {
 				// 播放音频
 				const innerAudioContext = uni.createInnerAudioContext();
diff --git a/pages/user/address/create.vue b/pages/user/address/create.vue
index b5b8fb7..02f0dea 100644
--- a/pages/user/address/create.vue
+++ b/pages/user/address/create.vue
@@ -105,7 +105,6 @@
           city_id: this.addressIdList[1],
           district_id: this.addressIdList[2]
         }
-		console.log(params,'params。。。')
         if (params.name.trim() === '') {
           uni.showToast({
             title: '请重新核对姓名',
diff --git a/pages/user/address/list.vue b/pages/user/address/list.vue
index b13894a..d837806 100644
--- a/pages/user/address/list.vue
+++ b/pages/user/address/list.vue
@@ -59,7 +59,6 @@
 		},
 
 		onLoad(e) {
-			console.log(e)
 			if (e.type !== undefined) {
 				this.type = e.type
 			}
@@ -140,7 +139,6 @@
 				addresses().then(res => {
 					this.addressLists = res
 					uni.stopPullDownRefresh()
-					console.log(this.type === '1', this.type)
 					if (this.type == '1') {
 						if (this.addressLists.length === 0) {
 							let pages = getCurrentPages();
diff --git a/pages/user/code.vue b/pages/user/code.vue
index 8a94aeb..bb518d8 100644
--- a/pages/user/code.vue
+++ b/pages/user/code.vue
@@ -34,7 +34,7 @@
 			</swiper>
 		</view>
 		<view class="footer">
-			<view class="hith">朋友通过你的邀请注册成功后，将与您绑定好友关系通过成为平台用户，你都可以获得积分奖励。</view>
+			<view class="hith">朋友通过你的邀请注册成功后，将与您绑定好友关系通过成为平台用户，你都可以获得贡献值奖励。</view>
 			<view class="number">
 				<view class="title">邀请码 : {{inviteData[0].invite}}</view>
                 <view class="value" @click="copyCenter(inviteData[0].invite)">复制邀请码</view>
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 81e3c1f..a0afe20 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -142,7 +142,7 @@
 							<view class="assets-label-number">{{userData.account.cash || 0}}</view>
 						</view>
 						<view class="assets-label" @click="$Router.push({name:'Fragment'})">
-							<view class="assets-label-name">积分
+							<view class="assets-label-name">贡献值
 								<image @click.stop="showHelp('chip')" class="assets-label-icon"
 									src="/static/user/userAssets_tips.png" />
 							</view>
@@ -391,9 +391,6 @@
 			userInfo() {
 				// 读取配置信息
 				userIndex().then(res => {
-					
-					console.log(res)
-					
 					res.account = {
 						stone: res.stone,
 						stone_value: res.stone_value,
@@ -455,7 +452,7 @@
 			showHelp(type) {
 				let title = '通证',
 					content = this.helpDoc.energy_ball.description
-				if (type == 'chip') title = '积分'
+				if (type == 'chip') title = '贡献值'
 				if (type == 'chip') content = this.helpDoc.energy_shard.description
 				uni.showModal({
 					title: title,
diff --git a/pages/user/order/logistics.vue b/pages/user/order/logistics.vue
index 0775d35..a07a8c4 100644
--- a/pages/user/order/logistics.vue
+++ b/pages/user/order/logistics.vue
@@ -48,7 +48,6 @@
 		methods: {
 			getLogistic(no) {
 				mallShipmentsLogistic(no).then(res => {
-					console.log(res)
 					this.list = res.logistics
 					this.express = res.express
 					this.loaded = true
@@ -65,8 +64,6 @@
 				uni.setClipboardData({
 					data: no,
 					success: res=>{
-						console.log('success');
-						console.log(res)
 					}
 				});
 			},
diff --git a/pages/user/order/mallRefund.vue b/pages/user/order/mallRefund.vue
index 951953a..b5d3bc1 100644
--- a/pages/user/order/mallRefund.vue
+++ b/pages/user/order/mallRefund.vue
@@ -1,326 +1,330 @@
 <template>
-  <view class="NumberWeight">
-	  <!-- 订单分类 -->
-	  <scroll-view class="nav" scroll-x="true" :scroll-into-view='selectCategoryId'	scroll-with-animation="true">
-	    <view :class="['nav-item' ,selectNavId === item.id?'nav-item-selected':'']" v-for="(item,index) in navList"
-	      :key="index" @click="selectNav(item.id)">
-		  {{item.name}}
-		  {{item.id ==='apply' && count.apply >0 ? '('+count.apply + ')':''}}
-		  {{item.id ==='deliver' && count.deliver >0 ?'('+count.deliver + ')':''}}
-		  {{item.id ==='delivered' && count.delivered >0 ?'('+count.delivered + ')':''}}
-		  {{item.id ==='signed' && count.signed >0 ?'('+count.signed + ')':''}}
-		  {{item.id ==='process' && count.process >0 ?'('+count.process + ')':''}}
-		  {{item.id ==='completed' && count.completed >0 ?'('+count.completed + ')':''}}
+	<view class="NumberWeight">
+		<!-- 订单分类 -->
+		<scroll-view class="nav" scroll-x="true" :scroll-into-view='selectCategoryId' scroll-with-animation="true">
+			<view :class="['nav-item' ,selectNavId === item.id?'nav-item-selected':'']" v-for="(item,index) in navList"
+				:key="index" @click="selectNav(item.id)">
+				{{item.name}}
+				{{item.id ==='apply' && count.apply >0 ? '('+count.apply + ')':''}}
+				{{item.id ==='deliver' && count.deliver >0 ?'('+count.deliver + ')':''}}
+				{{item.id ==='delivered' && count.delivered >0 ?'('+count.delivered + ')':''}}
+				{{item.id ==='signed' && count.signed >0 ?'('+count.signed + ')':''}}
+				{{item.id ==='process' && count.process >0 ?'('+count.process + ')':''}}
+				{{item.id ==='completed' && count.completed >0 ?'('+count.completed + ')':''}}
+			</view>
+		</scroll-view>
+
+		<!-- 有订单列表 -->
+		<view class="" v-if="lists.length > 0">
+			<!-- 订单列表 -->
+			<view class="order-list" v-for="(item,index) in lists" :key="index">
+				<MallRefundsTemplate :item="item" />
+				<view class="actions">
+					<view @click="goDetail(item.refund_id)" class="nowPay">查看详情</view>
+				</view>
+			</view>
 		</view>
-	  </scroll-view>
-	  
-    <!-- 有订单列表 -->
-    <view class="" v-if="lists.length > 0">
-      <!-- 订单列表 -->
-      <view class="order-list" v-for="(item,index) in lists" :key="index">
-        <MallRefundsTemplate :item="item" />
-        <view class="actions">
-          <view @click="goDetail(item.refund_id)" class="nowPay">查看详情</view>
-        </view>
-      </view>
-    </view>
-    <!-- 没有订单列表 -->
-    <no-list v-if="lists.length === 0" name='no-order' txt="暂无数据~" />
-	
-	<!-- <u-toast ref="uToast" /> -->
-	<u-toast ref="uToast" />
-  </view>
+		<!-- 没有订单列表 -->
+		<no-list v-if="lists.length === 0" name='no-order' txt="暂无数据~" />
+
+		<!-- <u-toast ref="uToast" /> -->
+		<u-toast ref="uToast" />
+	</view>
 </template>
 
 <script>
-  import {
-    MallRefundsTemplate
-  } from '@/components/mall-refunds-template/mall-refunds-template'
-  import { mallRefunds } from '@/apis/interfaces/numberWeight'
-  export default {
-    components: {
-      MallRefundsTemplate
-    },
-    data() {
-      return {
-        lists: [],
-		page:1,
-		total:0,
-		navList: [{
-		    name: '待审核',
-		    id: 'apply'
-		  },{
-		    name: '待返货',
-		    id: 'deliver'
-		  },{
-		    name: '待签收',
-		    id: 'delivered'
-		  },{
-		    name: '已签收',
-		    id: 'signed'
-		  },
-		  {
-		    name: '待退权证',
-		    id: 'process'
-		  },
-		  {
-		    name: '完成退货',
-		    id: 'completed'
-		  }
-		],
-		selectNavId: 'apply',
-		count:{}
-      };
-    },
-	onLoad() {
-		this.getList()
-	},
-	onShow(){
-		console.log(uni.getStorageSync('refresh'),'getStorageSync')
-		if(uni.getStorageSync('refresh')){
-			this.reset()
-		}
-	},
-	onUnload() {
-		uni.setStorageSync('refresh',false)
-	},
-	onReachBottom() {
-		if(this.total>this.lists.length){
-			this.page = this.page + 1
-			this.getList()
-		}else{
-			this.$refs.uToast.show({
-			  title: '吼吼吼~我是有底的~',
-			  type: 'error',icon:false,
-			  duration: 3000
-			})
-		}
-	},
-    methods: {
-		reset(){
-			this.page =1
-			this.total = 0
-			this.lists = []
-			this.getList()
-			uni.setStorageSync('refresh',false)
+	import {
+		MallRefundsTemplate
+	} from '@/components/mall-refunds-template/mall-refunds-template'
+	import {
+		mallRefunds
+	} from '@/apis/interfaces/numberWeight'
+	export default {
+		components: {
+			MallRefundsTemplate
 		},
-		// 选择订单
-		selectNav(id) {
-		  if (this.selectNavId !== id) {
-		    this.selectNavId = id
-			this.reset()
-		  }
+		data() {
+			return {
+				lists: [],
+				page: 1,
+				total: 0,
+				navList: [{
+						name: '待审核',
+						id: 'apply'
+					}, {
+						name: '待返货',
+						id: 'deliver'
+					}, {
+						name: '待签收',
+						id: 'delivered'
+					}, {
+						name: '已签收',
+						id: 'signed'
+					},
+					{
+						name: '待退权证',
+						id: 'process'
+					},
+					{
+						name: '完成退货',
+						id: 'completed'
+					}
+				],
+				selectNavId: 'apply',
+				count: {}
+			};
 		},
-		// 获取订单列表
-		getList(){
-			let data = {
-				pageSize:20,
-				page:this.page,
-				state:this.selectNavId
+		onLoad() {
+			this.getList()
+		},
+		onShow() {
+			if (uni.getStorageSync('refresh')) {
+				this.reset()
 			}
-			mallRefunds(data).then(res=>{
-				console.log(res)
-				this.count = res.count
-				this.lists = this.lists.concat(res.lists.data)
-				this.total = res.lists.page.total
-			}).catch(err=>{
+		},
+		onUnload() {
+			uni.setStorageSync('refresh', false)
+		},
+		onReachBottom() {
+			if (this.total > this.lists.length) {
+				this.page = this.page + 1
+				this.getList()
+			} else {
 				this.$refs.uToast.show({
-				  title: err.message,
-				  type: 'error',icon:false,
-				  duration: 3000
+					title: '吼吼吼~我是有底的~',
+					type: 'error',
+					icon: false,
+					duration: 3000
 				})
-			})
+			}
 		},
-		// 取消提货单
-		nowCancel(index,no){
-			console.log(index,no)
-			uni.showModal({
-			    title: '哎呦，提醒你',
-			    content: '是否确认要取消订单啊，取消后请去我的权证中查看',
-			    success:  (res) =>{
-			        if (res.confirm) {
-			            mallShipmentsCancel(no).then(res=>{
-			            	console.log(res)
-							this.$refs.uToast.show({
-							  title:res,
-							  type: 'error',icon:false,
-							  duration: 3000
+		methods: {
+			reset() {
+				this.page = 1
+				this.total = 0
+				this.lists = []
+				this.getList()
+				uni.setStorageSync('refresh', false)
+			},
+			// 选择订单
+			selectNav(id) {
+				if (this.selectNavId !== id) {
+					this.selectNavId = id
+					this.reset()
+				}
+			},
+			// 获取订单列表
+			getList() {
+				let data = {
+					pageSize: 20,
+					page: this.page,
+					state: this.selectNavId
+				}
+				mallRefunds(data).then(res => {
+					this.count = res.count
+					this.lists = this.lists.concat(res.lists.data)
+					this.total = res.lists.page.total
+				}).catch(err => {
+					this.$refs.uToast.show({
+						title: err.message,
+						type: 'error',
+						icon: false,
+						duration: 3000
+					})
+				})
+			},
+			// 取消提货单
+			nowCancel(index, no) {
+				uni.showModal({
+					title: '哎呦，提醒你',
+					content: '是否确认要取消订单啊，取消后请去我的权证中查看',
+					success: (res) => {
+						if (res.confirm) {
+							mallShipmentsCancel(no).then(res => {
+								this.$refs.uToast.show({
+									title: res,
+									type: 'error',
+									icon: false,
+									duration: 3000
+								})
+								this.lists.splice(index, 1)
+								this.total = this.total - 1
+							}).catch(err => {
+								this.$refs.uToast.show({
+									title: err.message,
+									type: 'error',
+									icon: false,
+									duration: 3000
+								})
 							})
-			            	this.lists.splice(index,1)
-			            	this.total = this.total - 1
-			            }).catch(err=>{
-			            	this.$refs.uToast.show({
-			            	  title: err.message,
-			            	  type: 'error',icon:false,
-			            	  duration: 3000
-			            	})
-			            })
-			        } else if (res.cancel) {
-						this.$refs.uToast.show({
-						  title:'放弃了~',
-						  type: 'error',icon:false,
-						  duration: 3000
-						})
-			        }
-			    }
-			});
-		
-		},
-		// 签收提货单
-		nowSign(index,no){
-			console.log(index,no)
-			uni.showModal({
-			    title: '哎呦，提醒你',
-			    content: '是否确认已经收到商品了呀',
-			    success:  (res) =>{
-			        if (res.confirm) {
-						console.log(no)
-			            mallShipmentsSign(no).then(res=>{
-			            	console.log(res)
+						} else if (res.cancel) {
 							this.$refs.uToast.show({
-							  title:res,
-							  type: 'error',icon:false,
-							  duration: 3000
+								title: '放弃了~',
+								type: 'error',
+								icon: false,
+								duration: 3000
 							})
-			            	this.lists.splice(index,1)
-			            	this.total = this.total - 1
-			            }).catch(err=>{
-			            	this.$refs.uToast.show({
-			            	  title: err.message,
-			            	  type: 'error',icon:false,
-			            	  duration: 3000
-			            	})
-			            })
-			        
-					} else if (res.cancel) {
-						this.$refs.uToast.show({
-						  title:'放弃了~',
-						  type: 'error',icon:false,
-						  duration: 3000
-						})
-			        }
-			    }
-			});
-		},
-		
-		// 查看详情
-		goDetail(no){
-			this.$router.push({
-			  name: 'MallRefundsInfo',
-			  params:{
-				  no:no
-			  }
-			})
+						}
+					}
+				});
+
+			},
+			// 签收提货单
+			nowSign(index, no) {
+				uni.showModal({
+					title: '哎呦，提醒你',
+					content: '是否确认已经收到商品了呀',
+					success: (res) => {
+						if (res.confirm) {
+							mallShipmentsSign(no).then(res => {
+								this.$refs.uToast.show({
+									title: res,
+									type: 'error',
+									icon: false,
+									duration: 3000
+								})
+								this.lists.splice(index, 1)
+								this.total = this.total - 1
+							}).catch(err => {
+								this.$refs.uToast.show({
+									title: err.message,
+									type: 'error',
+									icon: false,
+									duration: 3000
+								})
+							})
+
+						} else if (res.cancel) {
+							this.$refs.uToast.show({
+								title: '放弃了~',
+								type: 'error',
+								icon: false,
+								duration: 3000
+							})
+						}
+					}
+				});
+			},
+
+			// 查看详情
+			goDetail(no) {
+				this.$router.push({
+					name: 'MallRefundsInfo',
+					params: {
+						no: no
+					}
+				})
+			}
 		}
-    }
-  }
+	}
 </script>
 
 <style lang="scss" scoped>
-  page {
-    width: 100%;
-    height: 100%;
-  }
+	page {
+		width: 100%;
+		height: 100%;
+	}
 
-  .NumberWeight {
-    width: 100%;
-    min-height: 100vh;
-    box-sizing: border-box;
-    background-color: #F7F7F7;
+	.NumberWeight {
+		width: 100%;
+		min-height: 100vh;
+		box-sizing: border-box;
+		background-color: #F7F7F7;
 
-    // 订单nav
-    .nav {
-	  display: flex;
-	  flex-direction: row;
-	  align-items: center;
-	  justify-content: flex-start;
-	  box-sizing: border-box;
-	  white-space: nowrap;
-      font-size: $title-size*0.95;
-      padding: 0 30rpx;
-      background-color: #fff;
-      color: #666;
-      border-top: solid 20rpx #f7f7f7;
-	  position: sticky;
-	  top: 0rpx;
-	  z-index: 1;
+		// 订单nav
+		.nav {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: flex-start;
+			box-sizing: border-box;
+			white-space: nowrap;
+			font-size: $title-size*0.95;
+			padding: 0 30rpx;
+			background-color: #fff;
+			color: #666;
+			border-top: solid 20rpx #f7f7f7;
+			position: sticky;
+			top: 0rpx;
+			z-index: 1;
 
-      .nav-item {
-	    display: inline-block;
-        border-bottom: solid 4rpx #fff;
-        padding: 30rpx 10rpx;
-		margin-right: 10rpx;
-      }
+			.nav-item {
+				display: inline-block;
+				border-bottom: solid 4rpx #fff;
+				padding: 30rpx 10rpx;
+				margin-right: 10rpx;
+			}
 
-      .nav-item-selected {
-        border-bottom: solid 4rpx $main-color;
-        color: $main-color;
-      }
-    }
+			.nav-item-selected {
+				border-bottom: solid 4rpx $main-color;
+				color: $main-color;
+			}
+		}
 
-    // 订单列表
-    .order-list {
-      background-color: #fff;
-      border-radius: 20rpx;
-      min-height: 300rpx;
-      margin: 30rpx 20rpx 0 20rpx;
-      padding:30rpx 30rpx 20rpx 30rpx ;
-	  // border-top: solid 4rpx #cacaca;
+		// 订单列表
+		.order-list {
+			background-color: #fff;
+			border-radius: 20rpx;
+			min-height: 300rpx;
+			margin: 30rpx 20rpx 0 20rpx;
+			padding: 30rpx 30rpx 20rpx 30rpx;
+			// border-top: solid 4rpx #cacaca;
 
-      // 操作信息
-      .actions {
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        justify-content: flex-end;
-        box-sizing: border-box;
-        flex-wrap: wrap;
-        flex: 1;
-        font-size: 28rpx;
-        color: #fff;
-		border-top: solid 1rpx #EFF4F2;
-        .nowPay {
-          padding: 4rpx 20rpx;
-          border-radius: 40rpx;
-          margin-left: 20rpx;
-          margin-top: 20rpx;
-          // background-color: $main-color;
-		  color: #999;
-		  border:solid 1rpx #cacaca;
-        }
+			// 操作信息
+			.actions {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: flex-end;
+				box-sizing: border-box;
+				flex-wrap: wrap;
+				flex: 1;
+				font-size: 28rpx;
+				color: #fff;
+				border-top: solid 1rpx #EFF4F2;
 
-        .cancelOrder {
-          padding: 10rpx 30rpx;
-          border-radius: 40rpx;
-          margin-left: 20rpx;
-          margin-top: 20rpx;
-          background-color: #DD524D;
-        }
+				.nowPay {
+					padding: 4rpx 20rpx;
+					border-radius: 40rpx;
+					margin-left: 20rpx;
+					margin-top: 20rpx;
+					// background-color: $main-color;
+					color: #999;
+					border: solid 1rpx #cacaca;
+				}
 
-        .logistics {
-          background-color: $main-color;
-          padding: 10rpx 30rpx;
-          border-radius: 40rpx;
-          margin-left: 20rpx;
-          margin-top: 20rpx;
-        }
+				.cancelOrder {
+					padding: 10rpx 30rpx;
+					border-radius: 40rpx;
+					margin-left: 20rpx;
+					margin-top: 20rpx;
+					background-color: #DD524D;
+				}
 
-        .sign {
-          background-color: #DD524D;
-          padding: 10rpx 30rpx;
-          border-radius: 40rpx;
-          margin-left: 20rpx;
-          margin-top: 20rpx;
-        }
+				.logistics {
+					background-color: $main-color;
+					padding: 10rpx 30rpx;
+					border-radius: 40rpx;
+					margin-left: 20rpx;
+					margin-top: 20rpx;
+				}
 
-        .evaluate {
-          background-color: $main-color;
-          padding: 10rpx 30rpx;
-          border-radius: 40rpx;
-          margin-left: 20rpx;
-          margin-top: 20rpx;
-        }
-      }
-    }
-  }
+				.sign {
+					background-color: #DD524D;
+					padding: 10rpx 30rpx;
+					border-radius: 40rpx;
+					margin-left: 20rpx;
+					margin-top: 20rpx;
+				}
+
+				.evaluate {
+					background-color: $main-color;
+					padding: 10rpx 30rpx;
+					border-radius: 40rpx;
+					margin-left: 20rpx;
+					margin-top: 20rpx;
+				}
+			}
+		}
+	}
 </style>
diff --git a/pages/user/order/mallRefundsInfo.vue b/pages/user/order/mallRefundsInfo.vue
index e0f8e97..7c9051e 100644
--- a/pages/user/order/mallRefundsInfo.vue
+++ b/pages/user/order/mallRefundsInfo.vue
@@ -128,7 +128,6 @@
 				})
 			},
 			priveImg(index,idx){
-				console.log(this.logs[index].pictures);
 				uni.previewImage({
 					current:idx,
 					urls:this.logs[index].pictures
@@ -163,7 +162,6 @@
 					success: (res) => {
 						if (res.confirm) {
 							mallRefundsDeliver(data).then(res => {
-								console.log(res)
 								this.$refs.uToast.show({
 									title: res,
 									type: 'error',icon:false,
diff --git a/pages/user/order/mallShipments.vue b/pages/user/order/mallShipments.vue
index dffcdae..ec1c68a 100644
--- a/pages/user/order/mallShipments.vue
+++ b/pages/user/order/mallShipments.vue
@@ -158,7 +158,6 @@
 			this.getList()
 		},
 		onShow() {
-			console.log(uni.getStorageSync('refresh'), 'getStorageSync')
 			if (uni.getStorageSync('refresh')) {
 				this.reset()
 			}
@@ -196,7 +195,6 @@
 			},
 			// 快递单post 提货单 take 退货单refund
 			selectType(id,index) {
-				console.log('id：' + id)
 				if (this.selectTypeId !== id) {
 					this.state = this.typeList[index].categrery[0].id
 					this.selectTypeId = id
@@ -221,7 +219,6 @@
 					apiUrl = 'mall/refunds'
 				}
 				mallShipmentsPostShop(apiUrl, data).then(res => {
-					console.log(res.count)
 					this.count = res.count
 					this.lists = this.lists.concat(res.lists.data)
 					this.total = res.lists.page.total
@@ -236,14 +233,12 @@
 			},
 			// 取消提货单
 			nowCancel(index, no) {
-				console.log(index, no)
 				uni.showModal({
 					title: '哎呦，提醒你',
 					content: '是否确认要取消订单啊，取消后请去我的权证中查看',
 					success: (res) => {
 						if (res.confirm) {
 							mallShipmentsCancel(no).then(res => {
-								console.log(res)
 								this.$refs.uToast.show({
 									title: res,
 									type: 'error',
@@ -274,15 +269,12 @@
 			},
 			// 签收提货单
 			nowSign(index, no) {
-				console.log(index, no)
 				uni.showModal({
 					title: '哎呦，提醒你',
 					content: '是否确认已经收到商品了呀',
 					success: (res) => {
 						if (res.confirm) {
-							console.log(no)
 							mallShipmentsSign(no).then(res => {
-								console.log(res)
 								this.$refs.uToast.show({
 									title: res,
 									type: 'error',
diff --git a/pages/user/order/mallShipmentsInfo.vue b/pages/user/order/mallShipmentsInfo.vue
index 5e31718..19a298c 100644
--- a/pages/user/order/mallShipmentsInfo.vue
+++ b/pages/user/order/mallShipmentsInfo.vue
@@ -1,669 +1,697 @@
 <template>
-  <view class="OrderInfo" v-if="loaded">
-    <!-- 订单状态 -->
-    <view class="order-status">
-      <view class="info">
-        {{info.state_text}}
-        <span>您的快递正在坐着火箭朝您飞来</span>
-      </view>
-      <image src="/static/imgs/fire.png" mode="widthFix"></image>
-    </view>
-    <!-- 收货人 -->
-    <view class="acceptInfo" v-if="type === '1'" >
-		<block >
-			<view class="name">{{address.name}} <span>{{address.mobile}}</span> </view>
-			<view class="address">
-			  <u-icon name="map" color="red"></u-icon>
-			  <span>{{address.full_address}}</span>
+	<view class="OrderInfo" v-if="loaded">
+		<!-- 订单状态 -->
+		<view class="order-status">
+			<view class="info">
+				{{info.state_text}}
+				<span>您的快递正在坐着火箭朝您飞来</span>
 			</view>
-		</block>
-    </view>
-	
-    <view class="goods-info1">
-        <view class="top" >
-          <view class="company">
-            <view class="company-logo">
-              <image :src="info.shop.cover" mode="aspectFill" />
-              <view class="name ellipsis">{{info.shop.name}}</view>
-            </view>
-            <view class="flexrow">
-            	<view class="no ellipsis">发货单号： {{info.shipment_no}}</view>
-            </view>
-          </view>
-      </view>
-      <view class="goods-info">
-        <image class="goods-img" :src="info.goods_sku.cover" mode="aspectFill" />
-        <view class="goods">
-          <view class="name">
-            <view class="name1 ellipsis-2">{{info.goods_sku.goods_name}}</view> 
-			<!-- <span>￥16.80</span> -->
-          </view>
-          <view class="sku">权证个数 <span>x {{info.qty}}</span> </view>
-        </view>
-      </view>
-     <navigator class="total" hover-class="none" :url='"/pages/goods/details?id="+info.goods_sku.goods_id'>
-        <view class="total-btn">再次购买</view>
-      </navigator>
-      <view class="goods-type">创建提货单时间 <span>{{info.created_at}}</span></view>
-      <view class="goods-type"  v-if="type === '1'">运费 <span>免邮</span></view>
-	  <view class="goods-type">提货数量 <span><u-number-box v-model="info.qty" :disabled="true"></u-number-box></span></view>
-      <view class="goods-type">提货方式 
-		<u-radio-group v-model="type">
-			<u-radio 
-				v-for="(item, index) in list" :key="index" 
-				:name="item.id"
-				:disabled="type !== item.id"
-			>
-				{{item.name}}
-			</u-radio>
-		</u-radio-group>
-	  </view>
-	<!--  <view class="goods-type" v-if="type === '2'">提货码
+			<image src="/static/imgs/fire.png" mode="widthFix"></image>
+		</view>
+		<!-- 收货人 -->
+		<view class="acceptInfo" v-if="type === '1'">
+			<block>
+				<view class="name">{{address.name}} <span>{{address.mobile}}</span> </view>
+				<view class="address">
+					<u-icon name="map" color="red"></u-icon>
+					<span>{{address.full_address}}</span>
+				</view>
+			</block>
+		</view>
+
+		<view class="goods-info1">
+			<view class="top">
+				<view class="company">
+					<view class="company-logo">
+						<image :src="info.shop.cover" mode="aspectFill" />
+						<view class="name ellipsis">{{info.shop.name}}</view>
+					</view>
+					<view class="flexrow">
+						<view class="no ellipsis">发货单号： {{info.shipment_no}}</view>
+					</view>
+				</view>
+			</view>
+			<view class="goods-info">
+				<image class="goods-img" :src="info.goods_sku.cover" mode="aspectFill" />
+				<view class="goods">
+					<view class="name">
+						<view class="name1 ellipsis-2">{{info.goods_sku.goods_name}}</view>
+						<!-- <span>￥16.80</span> -->
+					</view>
+					<view class="sku">权证个数 <span>x {{info.qty}}</span> </view>
+				</view>
+			</view>
+			<navigator class="total" hover-class="none" :url='"/pages/goods/details?id="+info.goods_sku.goods_id'>
+				<view class="total-btn">再次购买</view>
+			</navigator>
+			<view class="goods-type">创建提货单时间 <span>{{info.created_at}}</span></view>
+			<view class="goods-type" v-if="type === '1'">运费 <span>免邮</span></view>
+			<view class="goods-type">提货数量 <span>
+					<u-number-box v-model="info.qty" :disabled="true"></u-number-box>
+				</span></view>
+			<view class="goods-type">提货方式
+				<u-radio-group v-model="type">
+					<u-radio v-for="(item, index) in list" :key="index" :name="item.id" :disabled="type !== item.id">
+						{{item.name}}
+					</u-radio>
+				</u-radio-group>
+			</view>
+			<!--  <view class="goods-type" v-if="type === '2'">提货码
 	  		<span @click='takeCode'>查看提货码</span>
 	  </view> -->
-      <view class="goods-type-1" v-if="type === '2'">
-		提货门店 
-		<view class="goods-type-address">
-			<view class="list-top1">
-				<image :src="info.store.cover.showpath"  @click="map(info.store)" mode="aspectFill" class="list-top1-img" />
-				<view class="shop-info shop-info1">
-				  <view class="title ellipsis">{{info.store.name}}</view>
-				  <view class="des" style="padding-top: 16rpx;">营业时间：{{info.store.start_time}}</view>
-				  <view class="des" style="padding-top: 4rpx;" @click="call(info.store.mobile)">联系电话：{{info.store.mobile}}</view>
-				  <view class="des" style="padding-top: 4rpx;" @click="map(info.store)">门店地址：{{info.store.address}}</view>
+			<view class="goods-type-1" v-if="type === '2'">
+				提货门店
+				<view class="goods-type-address">
+					<view class="list-top1">
+						<image :src="info.store.cover.showpath" @click="map(info.store)" mode="aspectFill"
+							class="list-top1-img" />
+						<view class="shop-info shop-info1">
+							<view class="title ellipsis">{{info.store.name}}</view>
+							<view class="des" style="padding-top: 16rpx;">营业时间：{{info.store.start_time}}</view>
+							<view class="des" style="padding-top: 4rpx;" @click="call(info.store.mobile)">
+								联系电话：{{info.store.mobile}}</view>
+							<view class="des" style="padding-top: 4rpx;" @click="map(info.store)">
+								门店地址：{{info.store.address}}</view>
+						</view>
+					</view>
 				</view>
 			</view>
 		</view>
-	  </view>
-    </view>
-    <!-- 订单 -->
+		<!-- 订单 -->
 		<view class="actions">
-		  <view v-if="info.can.cancel" @click="nowCancel(shipment_no)" class="nowPay">取消订单</view>
-		  <view v-if="info.can.sign" @click="nowSign(shipment_no)" class="nowPay">确认签收</view>
-		  <view v-if="info.can.refund" @click="nowRefund(shipment_no)" class="nowPay">申请退货</view>
-		  <view v-if="info.can.logistic" @click="nowLogistics(shipment_no)" class="nowPay">查看物流</view>
+			<view v-if="info.can.cancel" @click="nowCancel(shipment_no)" class="nowPay">取消订单</view>
+			<view v-if="info.can.sign" @click="nowSign(shipment_no)" class="nowPay">确认签收</view>
+			<view v-if="info.can.refund" @click="nowRefund(shipment_no)" class="nowPay">申请退货</view>
+			<view v-if="info.can.logistic" @click="nowLogistics(shipment_no)" class="nowPay">查看物流</view>
 		</view>
-	<!-- <u-toast ref="uToast" /> -->
-	<u-toast ref="uToast" />
-  </view>
+		<!-- <u-toast ref="uToast" /> -->
+		<u-toast ref="uToast" />
+	</view>
 </template>
 
 <script>
-  import { mallShipmentsInfo,mallShipmentsCancel,mallShipmentsSign } from '@/apis/interfaces/numberWeight'
-  export default {
-    name: 'OrderInfo',
-    data() {
-      return {
-		info:{},
-		list: [
-			{ name: '快递',	disabled: true , id:'1'},
-			{ name: '自提', disabled: false , id:'2'}
-		],
-		address:{},
-		type: '1', //提货类型：2 自提 1 邮寄
-		showStoreList: false, // 默认false不显示优惠券弹窗列表
-		store_id: '', // 默认没有选择任何一个优惠券
-		store_Name:'',// 门店名称
-		qty :1,
-		shipment_no:'', // 提货单no
-		loaded:false
-      };
-    },
-	onLoad(e) {
-		this.shipment_no = e.no
-		this.getInfo(e.no)
-	},
-	onShow() {
-		if(uni.getStorageSync('refresh')){
-			this.getInfo(this.shipment_no)
-		}
-	},
-    methods: {
-		getInfo(shipment_no){
-			mallShipmentsInfo(shipment_no).then(res=>{
-				this.info = res
-				this.address = res.express
-				this.type = res.type+''
-				this.loaded = true
-			}).catch(err=>{
+	import {
+		mallShipmentsInfo,
+		mallShipmentsCancel,
+		mallShipmentsSign
+	} from '@/apis/interfaces/numberWeight'
+	export default {
+		name: 'OrderInfo',
+		data() {
+			return {
+				info: {},
+				list: [{
+						name: '快递',
+						disabled: true,
+						id: '1'
+					},
+					{
+						name: '自提',
+						disabled: false,
+						id: '2'
+					}
+				],
+				address: {},
+				type: '1', //提货类型：2 自提 1 邮寄
+				showStoreList: false, // 默认false不显示优惠券弹窗列表
+				store_id: '', // 默认没有选择任何一个优惠券
+				store_Name: '', // 门店名称
+				qty: 1,
+				shipment_no: '', // 提货单no
+				loaded: false
+			};
+		},
+		onLoad(e) {
+			this.shipment_no = e.no
+			this.getInfo(e.no)
+		},
+		onShow() {
+			if (uni.getStorageSync('refresh')) {
+				this.getInfo(this.shipment_no)
+			}
+		},
+		methods: {
+			getInfo(shipment_no) {
+				mallShipmentsInfo(shipment_no).then(res => {
+					this.info = res
+					this.address = res.express
+					this.type = res.type + ''
+					this.loaded = true
+				}).catch(err => {
 					this.$refs.uToast.show({
-					  title: err.message,
-					  type: 'error',icon:false,
-					  duration: 3000
+						title: err.message,
+						type: 'error',
+						icon: false,
+						duration: 3000
 					})
 				})
-		},
-		// 取消提货单
-		nowCancel(no){
-			uni.showModal({
-			    title: '哎呦，提醒你',
-			    content: '是否确认要取消订单啊，取消后请去我的权证中查看',
-			    success:  (res) =>{
-			        if (res.confirm) {
-			            mallShipmentsCancel(no).then(res=>{
-			            	console.log(res)
-							this.$refs.uToast.show({
-							  title:res,
-							  type: 'error',icon:false,
-							  duration: 3000
+			},
+			// 取消提货单
+			nowCancel(no) {
+				uni.showModal({
+					title: '哎呦，提醒你',
+					content: '是否确认要取消订单啊，取消后请去我的权证中查看',
+					success: (res) => {
+						if (res.confirm) {
+							mallShipmentsCancel(no).then(res => {
+								this.$refs.uToast.show({
+									title: res,
+									type: 'error',
+									icon: false,
+									duration: 3000
+								})
+								this.getInfo(no)
+							}).catch(err => {
+								this.$refs.uToast.show({
+									title: err.message,
+									type: 'error',
+									icon: false,
+									duration: 3000
+								})
 							})
-							this.getInfo(no)
-			            }).catch(err=>{
-			            	this.$refs.uToast.show({
-			            	  title: err.message,
-			            	  type: 'error',icon:false,
-			            	  duration: 3000
-			            	})
-			            })
-			        } else if (res.cancel) {
-						this.$refs.uToast.show({
-						  title:'放弃了~',
-						  type: 'error',icon:false,
-						  duration: 3000
-						})
-			        }
-			    }
-			});
-		},
-		// 签收提货单
-		nowSign(no){
-			console.log(no)
-			uni.showModal({
-			    title: '哎呦，提醒你',
-			    content: '是否确认已经收到商品了呀',
-			    success:  (res) =>{
-			        if (res.confirm) {
-						console.log(no)
-			            mallShipmentsSign(no).then(res=>{
-			            	console.log(res)
+						} else if (res.cancel) {
 							this.$refs.uToast.show({
-							  title:res,
-							  type: 'error',icon:false,
-							  duration: 3000
+								title: '放弃了~',
+								type: 'error',
+								icon: false,
+								duration: 3000
 							})
-							this.getInfo(no)
-							uni.setStorageSync('refresh',true)
-			            }).catch(err=>{
-			            	this.$refs.uToast.show({
-			            	  title: err.message,
-			            	  type: 'error',icon:false,
-			            	  duration: 3000
-			            	})
-			            })
-			        
-					} else if (res.cancel) {
-						this.$refs.uToast.show({
-						  title:'放弃了~',
-						  type: 'error',icon:false,
-						  duration: 3000
-						})
-			        }
-			    }
-			});
-		},
-		// 查看提货二维码 弹窗
-		takeCode(){
-			console.log(this.info.code)
-			let url = this.info.code,
-			   urls = [this.info.code]
-			uni.previewImage({
-				current:url,
-				urls:urls
-			})
-		},
-		// 申请退货
-		nowRefund(no){
-			this.$router.push({
-			  name: 'MallShipmentsRefund',
-			  params:{
-				  no:no
-			  }
-			})
-		},
-		call(e){
-			uni.makePhoneCall({
-				phoneNumber:e
-			})
-		},
-		map(info){
-			console.log(info.latitude,info.longitude)
-			uni.openLocation({
-				latitude: Number(info.latitude),
-				longitude: Number(info.longitude),
-				success: function () {
-					console.log('success');
-				}
-			});
+						}
+					}
+				});
+			},
+			// 签收提货单
+			nowSign(no) {
+				uni.showModal({
+					title: '哎呦，提醒你',
+					content: '是否确认已经收到商品了呀',
+					success: (res) => {
+						if (res.confirm) {
+							mallShipmentsSign(no).then(res => {
+								this.$refs.uToast.show({
+									title: res,
+									type: 'error',
+									icon: false,
+									duration: 3000
+								})
+								this.getInfo(no)
+								uni.setStorageSync('refresh', true)
+							}).catch(err => {
+								this.$refs.uToast.show({
+									title: err.message,
+									type: 'error',
+									icon: false,
+									duration: 3000
+								})
+							})
+
+						} else if (res.cancel) {
+							this.$refs.uToast.show({
+								title: '放弃了~',
+								type: 'error',
+								icon: false,
+								duration: 3000
+							})
+						}
+					}
+				});
+			},
+			// 查看提货二维码 弹窗
+			takeCode() {
+				let url = this.info.code,
+					urls = [this.info.code]
+				uni.previewImage({
+					current: url,
+					urls: urls
+				})
+			},
+			// 申请退货
+			nowRefund(no) {
+				this.$router.push({
+					name: 'MallShipmentsRefund',
+					params: {
+						no: no
+					}
+				})
+			},
+			call(e) {
+				uni.makePhoneCall({
+					phoneNumber: e
+				})
+			},
+			map(info) {
+				uni.openLocation({
+					latitude: Number(info.latitude),
+					longitude: Number(info.longitude),
+					success: function() {}
+				});
+			}
+
 		}
-		
-    }
-  }
+	}
 </script>
 
 <style lang="scss" scoped>
-  page {
-    width: 100%;
-    height: 100%;
-  }
+	page {
+		width: 100%;
+		height: 100%;
+	}
 
-  .OrderInfo {
-    width: 100%;
-    min-height: 100vh;
-    box-sizing: border-box;
-    background-color: #F7F7F7;
-    padding-bottom: 80rpx;
+	.OrderInfo {
+		width: 100%;
+		min-height: 100vh;
+		box-sizing: border-box;
+		background-color: #F7F7F7;
+		padding-bottom: 80rpx;
 
-    .order-status {
-      width: 100%;
-      height: 300rpx;
-      background-image: linear-gradient(to bottom, $main-color, $main-color-light);
-      color: #Fff;
-      font-size: 36rpx;
-      padding: 30rpx 50rpx;
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      justify-content: space-between;
-      box-sizing: border-box;
+		.order-status {
+			width: 100%;
+			height: 300rpx;
+			background-image: linear-gradient(to bottom, $main-color, $main-color-light);
+			color: #Fff;
+			font-size: 36rpx;
+			padding: 30rpx 50rpx;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+			box-sizing: border-box;
 
-      .info {
-        font-size: 36rpx;
-        display: flex;
-        flex-direction: column;
-        align-items: flex-start;
-        justify-content: space-between;
-        box-sizing: border-box;
+			.info {
+				font-size: 36rpx;
+				display: flex;
+				flex-direction: column;
+				align-items: flex-start;
+				justify-content: space-between;
+				box-sizing: border-box;
 
-        span {
-          font-size: 28rpx;
-          padding-top: 30rpx;
-        }
-      }
+				span {
+					font-size: 28rpx;
+					padding-top: 30rpx;
+				}
+			}
 
-      image {
-        width: 200rpx;
-      }
-    }
-
-    .acceptInfo {
-      margin: 0 30rpx;
-      background-color: #fff;
-      box-shadow: 0 0 14rpx 4rpx rgba($color: $main-color, $alpha: 0.2);
-      border-radius: 20rpx;
-      padding: 30rpx;
-      position: relative;
-      top: -30rpx;
-
-      .name {
-        font-size: 36rpx;
-        font-weight: 600;
-
-        span {
-          padding-left: 20rpx;
-          font-size: 30rpx;
-        }
-      }
-
-      .address {
-        padding-top: 20rpx;
-        font-size: 28rpx;
-
-        span {
-          margin-left: 10rpx;
-        }
-      }
-    }
-
-    .goods-info1 {
-      padding: 20rpx 40rpx;
-      background-color: #fff;
-
-      .goods-type {
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        justify-content: space-between;
-        box-sizing: border-box;
-        padding: 30rpx 0;
-        border-bottom: solid 1rpx #f7f7f7;
-      }
-	  .goods-type-1{
-		  display: flex;
-		  flex-direction: column;
-		  align-items: flex-start;
-		  justify-content: space-between;
-		  box-sizing: border-box;
-		  padding: 30rpx 0;
-		  border-bottom: solid 1rpx #f7f7f7;
-	  }
-	  .goods-type-address{
-		  display: flex;
-		  flex-direction: row;
-		  align-items: center;
-		  justify-content: center;
-		  box-sizing: border-box;
-		  u-icon{
-			  padding-left: 20rpx;
-		  }
-	  }
-
-      // 顶部信息
-   .top {
-     display: flex;
-     flex-direction: row;
-     align-items: center;
-     justify-content: space-between;
-     box-sizing: border-box;
-	 padding: 30rpx 0;
-	 border-bottom: solid 1rpx #EFF4F2;
-  
-     .company-logo {
-       display: flex;
-       flex-direction: row;
-       align-items: center;
-       justify-content: flex-start;
-       box-sizing: border-box;
-   
-       image {
-         width: 40rpx;
-         height: 40rpx;
-         border-radius: 50%;
-         margin-right: 20rpx;
-       }
-   
-       .name {
-   		width: 600rpx;
-         font-size: 30rpx;
-         color: #484848;
-         font-weight: bold;
-       }
-     }
-   
-   
-     .no {
-       margin-top: 16rpx;
-       font-size: $title-size*0.8;
-       color: #999;
-   	  // width: 500rpx;
-     }
-   
-     .status {
-       color: #999;
-       font-size: $title-size;
-     }
-   }
-
-      // 商品信息
-      .goods-info {
-        display: flex;
-        flex-direction: row;
-        align-items: flex-start;
-        justify-content: flex-start;
-        box-sizing: border-box;
-        margin-top: 40rpx;
-
-        .goods-img {
-          width: 120rpx;
-          height: 120rpx;
-          border-radius: 10rpx;
-        }
-
-        .goods {
-          flex: 1;
-          margin-left: 20rpx;
-
-
-          .name {
-            width: 100%;
-            display: flex;
-            flex-direction: row;
-            align-items: flex-start;
-            justify-content: space-between;
-            box-sizing: border-box;
-            font-size: 30rpx;
-            // font-weight: bold;
-
-            .name1 {
-              width: 500rpx;
-            }
-
-            span {
-              font-size: 34rpx;
-              font-weight: normal;
-            }
-          }
-
-          .sku {
-            flex: 1;
-            display: flex;
-            flex-direction: row;
-            align-items: center;
-            justify-content: space-between;
-            box-sizing: border-box;
-            margin-top: 10rpx;
-            font-size: 28rpx;
-            color: #999;
-          }
-        }
-      }
-
-      // 合计信息
-      .total {
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        justify-content: flex-end;
-        box-sizing: border-box;
-        font-size: 26rpx;
-        color: $main-color;
-        flex: 1;
-        text-align: right;
-        margin-top: 20rpx;
-        padding-bottom: 30rpx;
-      }
-      
-      .total-btn {
-        border: solid 1rpx $main-color;
-        padding: 6rpx 20rpx;
-        border-radius: 10rpx;
-      }
-    }
-    // 操作信息
-      .actions {
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        justify-content: flex-end;
-        box-sizing: border-box;
-        flex-wrap: wrap;
-		background-color: #fff;
-        flex: 1;
-        font-size: 28rpx;
-		padding: 20rpx 50rpx 30rpx 50rpx;
-        color: #fff;
-        .nowPay {
-          padding: 4rpx 20rpx;
-          border-radius: 40rpx;
-          margin-left: 20rpx;
-          margin-top: 20rpx;
-          // background-color: $main-color;
-		  color: #999;
-		  border:solid 1rpx #cacaca;
-        }
-
-        .cancelOrder {
-          padding: 10rpx 30rpx;
-          border-radius: 40rpx;
-          margin-left: 20rpx;
-          margin-top: 20rpx;
-          background-color: #DD524D;
-        }
-
-        .logistics {
-          background-color: $main-color;
-          padding: 10rpx 30rpx;
-          border-radius: 40rpx;
-          margin-left: 20rpx;
-          margin-top: 20rpx;
-        }
-
-        .sign {
-          background-color: #DD524D;
-          padding: 10rpx 30rpx;
-          border-radius: 40rpx;
-          margin-left: 20rpx;
-          margin-top: 20rpx;
-        }
-
-        .evaluate {
-          background-color: $main-color;
-          padding: 10rpx 30rpx;
-          border-radius: 40rpx;
-          margin-left: 20rpx;
-          margin-top: 20rpx;
-        }
-      }
-  
-  }
-  .flexrow{
-  	  display: flex;
-  	  flex-direction: row;
-  	  align-items: center;
-  	  justify-content: space-between;
-  	  box-sizing: border-box;
-  	  width: 100%;
-  	  .copy{
-  		  color: $main-color;
-  			font-size: $title-size*0.8;
-  		  font-weight: 400;
-  		  padding: 0 30rpx;
-  	  }
-  }
-  .no-address{
-	display: flex;  
-	flex-direction: row;
-	align-items: center;
-	justify-content: center;
-	box-sizing: border-box;
-  }
-  // 优惠券弹窗
-  .scrollView {
-    // padding: 40rpx;
-    box-sizing: border-box;
-    position: relative;
-  
-    // 标题
-    .coupon-title {
-      padding: 40rpx;
-      font-weight: bold;
-      font-size: 40rpx;
-      border-bottom: solid 1rpx #f7f7f7;
-    }
-  
-    // 优惠券样式
-    .coupon-list-item {
-      border-bottom: solid 1rpx #f7f7f7;
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      justify-content: center;
-      box-sizing: border-box;
-      position: relative;
-      width: 100%;
-  
-      .coupon-list-item {
-        width: 100%;
-        height: 100%;
-        position: absolute;
-        top: 0;
-        left: 0;
-        background-color: rgba($color: #000, $alpha: 0);
-        z-index: 10001;
-      }
-    }
-  }
-  .list-top1{
-	  display: flex;
-	  flex-direction: row;
-	  align-items: flex-start;
-	  justify-content: space-between;
-	  box-sizing: border-box;
-	  font-size: $title-size*0.94;
-	  width: 100%;
-	  margin-left: 0 !important;
-	  margin-top: 30rpx;
-	  .shop-info{
-		  margin-left: 20rpx;
-	  }
-	  .list-top1-img{
-		  width:170rpx;
-		  height: 170rpx;
-		  border-radius: 10rpx;
-	  }
-	  .des{
-		  font-size: 28rpx;
-	  }
-	  .title{
-		  font-size: 32rpx;
-	  }
-  }
-  .list-top {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: space-between;
-    box-sizing: border-box;
-    padding: 30rpx 0;
-    font-size: $title-size*0.94;
-    border-bottom: solid 1rpx #f7f7f7;
-	width: 600rpx;
-	margin-left: 30rpx;
-    .list-top-left {
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      justify-content: flex-start;
-      box-sizing: border-box;
-		.shop-info{
-			flex: 1;
+			image {
+				width: 200rpx;
+			}
 		}
-      .title {
-        width: 380rpx;
-        font-size: $title-size*1;
-        font-weight: 400;
-      }
-  
-      .urate {
-        padding: 10rpx 0;
-      }
-  
-      .des {
-        // padding-top: $padding*0.8;
-        font-size: $title-size * 0.8;
-        color: #999;
-  
-        span {
-          color: #666;
-          padding: 0 10rpx;
-        }
-      }
-	
-      .list-banner {
-        width: 120rpx;
-        margin-right: $margin*1.5;
-        height: 120rpx;
-        border-radius: 4rpx;
-      }
-    }
-  
-    .list-top-right {
-      border: solid 1rpx $main-color;
-      color: $main-color;
-      display: inline-block;
-      padding: 8rpx 16rpx;
-      font-size: $title-size *0.8;
-      border-radius: 4rpx;
-    }
-  }
-  
+
+		.acceptInfo {
+			margin: 0 30rpx;
+			background-color: #fff;
+			box-shadow: 0 0 14rpx 4rpx rgba($color: $main-color, $alpha: 0.2);
+			border-radius: 20rpx;
+			padding: 30rpx;
+			position: relative;
+			top: -30rpx;
+
+			.name {
+				font-size: 36rpx;
+				font-weight: 600;
+
+				span {
+					padding-left: 20rpx;
+					font-size: 30rpx;
+				}
+			}
+
+			.address {
+				padding-top: 20rpx;
+				font-size: 28rpx;
+
+				span {
+					margin-left: 10rpx;
+				}
+			}
+		}
+
+		.goods-info1 {
+			padding: 20rpx 40rpx;
+			background-color: #fff;
+
+			.goods-type {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: space-between;
+				box-sizing: border-box;
+				padding: 30rpx 0;
+				border-bottom: solid 1rpx #f7f7f7;
+			}
+
+			.goods-type-1 {
+				display: flex;
+				flex-direction: column;
+				align-items: flex-start;
+				justify-content: space-between;
+				box-sizing: border-box;
+				padding: 30rpx 0;
+				border-bottom: solid 1rpx #f7f7f7;
+			}
+
+			.goods-type-address {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: center;
+				box-sizing: border-box;
+
+				u-icon {
+					padding-left: 20rpx;
+				}
+			}
+
+			// 顶部信息
+			.top {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: space-between;
+				box-sizing: border-box;
+				padding: 30rpx 0;
+				border-bottom: solid 1rpx #EFF4F2;
+
+				.company-logo {
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: flex-start;
+					box-sizing: border-box;
+
+					image {
+						width: 40rpx;
+						height: 40rpx;
+						border-radius: 50%;
+						margin-right: 20rpx;
+					}
+
+					.name {
+						width: 600rpx;
+						font-size: 30rpx;
+						color: #484848;
+						font-weight: bold;
+					}
+				}
+
+
+				.no {
+					margin-top: 16rpx;
+					font-size: $title-size*0.8;
+					color: #999;
+					// width: 500rpx;
+				}
+
+				.status {
+					color: #999;
+					font-size: $title-size;
+				}
+			}
+
+			// 商品信息
+			.goods-info {
+				display: flex;
+				flex-direction: row;
+				align-items: flex-start;
+				justify-content: flex-start;
+				box-sizing: border-box;
+				margin-top: 40rpx;
+
+				.goods-img {
+					width: 120rpx;
+					height: 120rpx;
+					border-radius: 10rpx;
+				}
+
+				.goods {
+					flex: 1;
+					margin-left: 20rpx;
+
+
+					.name {
+						width: 100%;
+						display: flex;
+						flex-direction: row;
+						align-items: flex-start;
+						justify-content: space-between;
+						box-sizing: border-box;
+						font-size: 30rpx;
+						// font-weight: bold;
+
+						.name1 {
+							width: 500rpx;
+						}
+
+						span {
+							font-size: 34rpx;
+							font-weight: normal;
+						}
+					}
+
+					.sku {
+						flex: 1;
+						display: flex;
+						flex-direction: row;
+						align-items: center;
+						justify-content: space-between;
+						box-sizing: border-box;
+						margin-top: 10rpx;
+						font-size: 28rpx;
+						color: #999;
+					}
+				}
+			}
+
+			// 合计信息
+			.total {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: flex-end;
+				box-sizing: border-box;
+				font-size: 26rpx;
+				color: $main-color;
+				flex: 1;
+				text-align: right;
+				margin-top: 20rpx;
+				padding-bottom: 30rpx;
+			}
+
+			.total-btn {
+				border: solid 1rpx $main-color;
+				padding: 6rpx 20rpx;
+				border-radius: 10rpx;
+			}
+		}
+
+		// 操作信息
+		.actions {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: flex-end;
+			box-sizing: border-box;
+			flex-wrap: wrap;
+			background-color: #fff;
+			flex: 1;
+			font-size: 28rpx;
+			padding: 20rpx 50rpx 30rpx 50rpx;
+			color: #fff;
+
+			.nowPay {
+				padding: 4rpx 20rpx;
+				border-radius: 40rpx;
+				margin-left: 20rpx;
+				margin-top: 20rpx;
+				// background-color: $main-color;
+				color: #999;
+				border: solid 1rpx #cacaca;
+			}
+
+			.cancelOrder {
+				padding: 10rpx 30rpx;
+				border-radius: 40rpx;
+				margin-left: 20rpx;
+				margin-top: 20rpx;
+				background-color: #DD524D;
+			}
+
+			.logistics {
+				background-color: $main-color;
+				padding: 10rpx 30rpx;
+				border-radius: 40rpx;
+				margin-left: 20rpx;
+				margin-top: 20rpx;
+			}
+
+			.sign {
+				background-color: #DD524D;
+				padding: 10rpx 30rpx;
+				border-radius: 40rpx;
+				margin-left: 20rpx;
+				margin-top: 20rpx;
+			}
+
+			.evaluate {
+				background-color: $main-color;
+				padding: 10rpx 30rpx;
+				border-radius: 40rpx;
+				margin-left: 20rpx;
+				margin-top: 20rpx;
+			}
+		}
+
+	}
+
+	.flexrow {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		box-sizing: border-box;
+		width: 100%;
+
+		.copy {
+			color: $main-color;
+			font-size: $title-size*0.8;
+			font-weight: 400;
+			padding: 0 30rpx;
+		}
+	}
+
+	.no-address {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
+	}
+
+	// 优惠券弹窗
+	.scrollView {
+		// padding: 40rpx;
+		box-sizing: border-box;
+		position: relative;
+
+		// 标题
+		.coupon-title {
+			padding: 40rpx;
+			font-weight: bold;
+			font-size: 40rpx;
+			border-bottom: solid 1rpx #f7f7f7;
+		}
+
+		// 优惠券样式
+		.coupon-list-item {
+			border-bottom: solid 1rpx #f7f7f7;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: center;
+			box-sizing: border-box;
+			position: relative;
+			width: 100%;
+
+			.coupon-list-item {
+				width: 100%;
+				height: 100%;
+				position: absolute;
+				top: 0;
+				left: 0;
+				background-color: rgba($color: #000, $alpha: 0);
+				z-index: 10001;
+			}
+		}
+	}
+
+	.list-top1 {
+		display: flex;
+		flex-direction: row;
+		align-items: flex-start;
+		justify-content: space-between;
+		box-sizing: border-box;
+		font-size: $title-size*0.94;
+		width: 100%;
+		margin-left: 0 !important;
+		margin-top: 30rpx;
+
+		.shop-info {
+			margin-left: 20rpx;
+		}
+
+		.list-top1-img {
+			width: 170rpx;
+			height: 170rpx;
+			border-radius: 10rpx;
+		}
+
+		.des {
+			font-size: 28rpx;
+		}
+
+		.title {
+			font-size: 32rpx;
+		}
+	}
+
+	.list-top {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		box-sizing: border-box;
+		padding: 30rpx 0;
+		font-size: $title-size*0.94;
+		border-bottom: solid 1rpx #f7f7f7;
+		width: 600rpx;
+		margin-left: 30rpx;
+
+		.list-top-left {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: flex-start;
+			box-sizing: border-box;
+
+			.shop-info {
+				flex: 1;
+			}
+
+			.title {
+				width: 380rpx;
+				font-size: $title-size*1;
+				font-weight: 400;
+			}
+
+			.urate {
+				padding: 10rpx 0;
+			}
+
+			.des {
+				// padding-top: $padding*0.8;
+				font-size: $title-size * 0.8;
+				color: #999;
+
+				span {
+					color: #666;
+					padding: 0 10rpx;
+				}
+			}
+
+			.list-banner {
+				width: 120rpx;
+				margin-right: $margin*1.5;
+				height: 120rpx;
+				border-radius: 4rpx;
+			}
+		}
+
+		.list-top-right {
+			border: solid 1rpx $main-color;
+			color: $main-color;
+			display: inline-block;
+			padding: 8rpx 16rpx;
+			font-size: $title-size *0.8;
+			border-radius: 4rpx;
+		}
+	}
 </style>
diff --git a/pages/user/order/mallShipmentsRefund.vue b/pages/user/order/mallShipmentsRefund.vue
index 4a0ad75..6e09e61 100644
--- a/pages/user/order/mallShipmentsRefund.vue
+++ b/pages/user/order/mallShipmentsRefund.vue
@@ -87,7 +87,6 @@
 		methods: {
 			// 预览上传图片
 			priviewImg(index) {
-				console.log(index, this.pictures.showpath)
 				uni.previewImage({
 					current: index,
 					urls: this.pictures.showpath
@@ -97,7 +96,6 @@
 			updImgs(type) {
 				uni.chooseImage({
 					success: res => {
-						console.log(res)
 						let path = res.tempFiles.map((val, index) => {
 							return {
 								name: 'uploads' + index,
@@ -105,12 +103,10 @@
 							}
 						})
 						uploads(path).then(pathRes => {
-							// console.log(pathRes)
 							this.pictures = {
 								path: [...this.pictures.path, ...pathRes.path],
 								showpath: [...this.pictures.showpath, ...pathRes.url]
 							}
-							console.log(this.pictures)
 						}).catch(err => {
 							uni.showToast({
 								title: err.message,
@@ -122,11 +118,8 @@
 			},
 			// 删除图片
 			closeImg(index) {
-				console.log(index)
 				this.pictures.path.splice(index, 1)
 				this.pictures.showpath.splice(index, 1)
-
-				console.log(this.pictures);
 			},
 			// 获取退货的基本信息
 			getInfo(shipment_no) {
@@ -139,7 +132,6 @@
 						}
 						lists.push(items)
 					})
-					console.log(lists)
 					this.list = lists
 				}).catch(err => {
 					this.$refs.uToast.show({
@@ -182,7 +174,6 @@
 					success: (res) => {
 						if (res.confirm) {
 							mallShipmentsRefund(data).then(res => {
-								console.log(res)
 								this.$refs.uToast.show({
 									title: res,
 									type: 'error',icon:false,
diff --git a/pages/user/order/numberWeight.vue b/pages/user/order/numberWeight.vue
index 3c69702..5e996d9 100644
--- a/pages/user/order/numberWeight.vue
+++ b/pages/user/order/numberWeight.vue
@@ -68,7 +68,6 @@
 					page: this.page
 				}
 				mallWarrants(data).then(res => {
-					console.log(res)
 					this.lists = this.lists.concat(res.data)
 					this.total = res.total
 				}).catch(err => {
diff --git a/pages/user/order/numberWeightInfo.vue b/pages/user/order/numberWeightInfo.vue
index c419e7f..4bcfdfd 100644
--- a/pages/user/order/numberWeightInfo.vue
+++ b/pages/user/order/numberWeightInfo.vue
@@ -224,11 +224,9 @@
 					}
 					data.store_id = ''
 				}
-				console.log(data)
 				// 快递单继续沿用之前的信息
 				if (data.type === '1') {
 					mallWarrantsSure(data).then(res => {
-						console.log(res)
 						this.$refs.uToast.show({
 							title: res,
 							type: 'error',icon:false,
@@ -250,7 +248,6 @@
 				// 提货或者服务单生成二维码
 				else {
 					mallWarrantsQrcode(data).then(res => {
-						console.log(res)
 						this.showCodeImg = res.code
 						// uni.setStorageSync('refresh', true)
 						this.showCode = true
diff --git a/pages/user/order/servicesOrder.vue b/pages/user/order/servicesOrder.vue
index 5e548ff..9bad1bb 100644
--- a/pages/user/order/servicesOrder.vue
+++ b/pages/user/order/servicesOrder.vue
@@ -63,7 +63,6 @@
 		this.getList()
 	},
 	onShow(){
-		console.log(uni.getStorageSync('refresh'),'getStorageSync')
 		if(uni.getStorageSync('refresh')){
 			this.reset()
 		}
@@ -108,7 +107,6 @@
 			apiUrl = 'mall/shipments/service'
 			data.channel = 'app'
 			mallShipmentsPostShop(apiUrl,data).then(res=>{
-				console.log(res.count)
 				this.count = res.count
 				this.lists = this.lists.concat(res.lists.data)
 				this.total = res.lists.page.total
diff --git a/pages/user/order/servicesOrderInfo.vue b/pages/user/order/servicesOrderInfo.vue
index 75e12b4..618ea8c 100644
--- a/pages/user/order/servicesOrderInfo.vue
+++ b/pages/user/order/servicesOrderInfo.vue
@@ -102,10 +102,8 @@
 			};
 		},
 		onLoad(e) {
-			console.log(e)
 			this.shipment_no = e.no
 			this.getInfo(e.no)
-			console.log(this.shipment_no)
 			// this.getInfo('2021081817410747800300000004')
 		},
 		onShow() {
@@ -134,12 +132,10 @@
 				})
 			},
 			map(info) {
-				console.log(info.latitude, info.longitude)
 				uni.openLocation({
 					latitude: Number(info.latitude),
 					longitude: Number(info.longitude),
 					success: function() {
-						console.log('success');
 					}
 				});
 			}
diff --git a/pages/verification/history.vue b/pages/verification/history.vue
index fcada04..025e6bb 100644
--- a/pages/verification/history.vue
+++ b/pages/verification/history.vue
@@ -159,7 +159,6 @@
 				}
 
 				scanList(apiUrl, data).then(res => {
-					console.log(res)
 					this.account = res.all
 					this.lists = this.lists.concat(res.lists.data)
 					this.has_more = res.lists.page.has_more
@@ -167,7 +166,6 @@
 					this.ShopList = [{name:'全部',store_id:''},...res.stores]
 					this.isBos = res.isBos
 				}).catch(err => {
-					console.log(err)
 					uni.showToast({
 						title: err.message,
 						type: 'error',
@@ -192,7 +190,6 @@
 			},
 			// 选择 年  月  日 切换要重置数据
 			selectType(type) {
-				console.log(type, typeof type)
 				if (this.type !== type) {
 					switch (type) {
 						case 'year':
diff --git a/pages/verification/index.vue b/pages/verification/index.vue
index 732c579..0494a87 100644
--- a/pages/verification/index.vue
+++ b/pages/verification/index.vue
@@ -60,12 +60,9 @@
 		},
 		methods: {
 			scanCode(e) {
-				console.log(e)
 				this.scanType = e
 				uni.scanCode({
 					success: (res) => {
-						console.log('条码类型：' + res.scanType);
-						console.log('条码内容：' + res.result);
 						// uni.showLoading({
 						// 	title: '核销请求中..'
 						// })
@@ -76,16 +73,13 @@
 			},
 			// 请求核销前置，优惠券前置和权证前置（get） post 是核销
 			scanInfo(token, method) {
-				console.log(token, this.scanType)
 				let apiUrl = ''
 				let data = {
 					code: token
 				}
 				if (this.scanType === 'goods') {
-					console.log('权证核销')
 					apiUrl = 'manages/warrants/verification'
 				} else {
-					console.log('优惠券核销！')
 					apiUrl = 'coupons/verify/coupon'
 				}
 				scanInfo(apiUrl, data, method).then(res => {
@@ -104,8 +98,6 @@
 							this.info = res
 						}
 					} else {
-						console.log('优惠券核销 有商品跳转优惠券详情页面，没有商品直接弹出核销页面！')
-						console.log(res, 'res')
 						if (method === 'post') {
 							this.showCode = false
 							this.$refs.uToast.show({
diff --git a/pages/vip/examine.vue b/pages/vip/examine.vue
index ab638e9..4b88fff 100644
--- a/pages/vip/examine.vue
+++ b/pages/vip/examine.vue
@@ -16,7 +16,6 @@
 	export default {
 		methods:{
 			toUser(){
-				console.log('trule')
 				uni.switchTab({
 					url:'/pages/user/index'
 				})
diff --git a/pages/vip/vip.vue b/pages/vip/vip.vue
index 1eca8e3..07fe205 100644
--- a/pages/vip/vip.vue
+++ b/pages/vip/vip.vue
@@ -270,7 +270,6 @@
 					type: 'app'
 				}).then(res => {
 					let payConfig = JSON.parse(res)
-					console.log(payConfig, 'console.log(res)')
 					uni.requestPayment({
 						provider: 'wxpay',
 						orderInfo: {
@@ -287,7 +286,6 @@
 							})
 						},
 						fail: payErr => {
-							console.log(payErr, 'console.log(payErr)')
 							uni.showToast({
 								title: '支付失败',
 								icon: 'none'
diff --git a/pages/wallet/addBank.vue b/pages/wallet/addBank.vue
index 4ff1b39..4c32236 100644
--- a/pages/wallet/addBank.vue
+++ b/pages/wallet/addBank.vue
@@ -73,7 +73,6 @@
 			// 获取添加银行前置条件
 			getAccountsCreate() {
 				accountsCreate().then(res => {
-					console.log(res)
 					this.banks = res.banks
 				}).catch(err => {
 					this.$refs.uToast.show({
@@ -86,7 +85,6 @@
 			// 编辑前置
 			getAccountsCreateEdit() {
 				accountsCreateEdit(this.bank_account_id).then(res => {
-					console.log(res)
 					this.banks = res.banks
 					this.no = res.info.no
 					this.name = res.info.name
@@ -104,7 +102,6 @@
 			},
 			// 选择银行
 			selectBank(e) {
-				console.log(e[0])
 				this.selectBankObj = e[0]
 				this.bank_id = e[0].value
 			},
@@ -158,7 +155,6 @@
 				}
 				if (this.bank_account_id) {
 					data.bank_account_id = this.bank_account_id
-					console.log(data)
 					this.withdrawsAccountsEdits(data)
 				} else {
 					this.withdrawsAccounts(data)
diff --git a/pages/wallet/bankList.vue b/pages/wallet/bankList.vue
index 132ef36..ae95788 100644
--- a/pages/wallet/bankList.vue
+++ b/pages/wallet/bankList.vue
@@ -73,7 +73,6 @@
 					page: this.page
 				}
 				withdrawsAccountsList(data).then(res => {
-					console.log(res)
 					this.lists = this.lists.concat(res.data)
 					this.has_more = res.page.has_more
 					uni.setStorageSync('refresh', false)
@@ -107,7 +106,6 @@
 					success(res) {
 						if (res.confirm) {
 							withdrawsAccountsDelete(id).then(res => {
-								console.log(res)
 								that.lists.splice(index, 1)
 								if (that.lists.length === 0) {
 									uni.navigateBack({})
@@ -132,7 +130,6 @@
 				// }
 				// let pages = getCurrentPages()
 				// let prevPage = pages[pages.length - 2]
-				// console.log(bankInfo)
 				// prevPage._data.bankInfo = bankInfo
 				// uni.navigateBack() //返回上一页面
 				
diff --git a/pages/wallet/extractRed.vue b/pages/wallet/extractRed.vue
index 3a08a35..728bb17 100644
--- a/pages/wallet/extractRed.vue
+++ b/pages/wallet/extractRed.vue
@@ -84,7 +84,6 @@
 			//  输入提现通证金额
 			inputNum(e) {
 				let number = Number(e.detail.value)
-				console.log(number, this.balance)
 				if (number <= Number(this.balance)) {
 					this.total = Number(e.detail.value) * this.cost
 				} else {
diff --git a/pages/wallet/fragment.vue b/pages/wallet/fragment.vue
index 0140aee..2c8f79d 100644
--- a/pages/wallet/fragment.vue
+++ b/pages/wallet/fragment.vue
@@ -35,7 +35,7 @@
 					<view :class="['pay_type_item',cointype==='0'?'pay_type_item_select':'']" @click="selectCoinType('0')">已发放</view>
 				</view>
 			</view>
-			<view class="record-title">当前积分个数</view>
+			<view class="record-title">当前贡献值个数</view>
 			<view class="record-money">{{score || '0.00'}} <span>个</span></view>
 		</view>
 		
@@ -53,7 +53,7 @@
 			</view>
 		</view>
 		<!-- 无列表 -->
-		<no-list v-if="lists.length === 0" name='no-record' txt="没有任何积分记录 ~ " />
+		<no-list v-if="lists.length === 0" name='no-record' txt="没有任何贡献值记录 ~ " />
 		
 		<!-- <u-toast ref="uToast" /> -->
 		<u-toast ref="uToast" />
diff --git a/pages/wallet/property.vue b/pages/wallet/property.vue
index be63d2c..d4b4494 100644
--- a/pages/wallet/property.vue
+++ b/pages/wallet/property.vue
@@ -140,7 +140,6 @@
 					success: (res) => {
 						switch (res.tapIndex) {
 							case 0:
-								console.log('提现了，')
 								this.$Router.push({
 									name: 'Extract'
 								})
diff --git a/pages/wallet/redProperty.vue b/pages/wallet/redProperty.vue
index 1a684b8..c3b09d4 100644
--- a/pages/wallet/redProperty.vue
+++ b/pages/wallet/redProperty.vue
@@ -58,11 +58,9 @@
 				this.reset()
 				uni.setStorageSync('refresh',false)
 			}else{
-				console.log('没有更多更新')
 			}
 		},
 		onReachBottom() {
-			console.log('chudi.....')
 			if(this.has_more){
 				this.page = this.page+1
 				this.getlog()
@@ -80,7 +78,6 @@
 					page:this.page					
 				}
 				accountCashs(data).then(res => {
-					console.log(res)
 					this.logs = this.logs.concat(res.lists.data)
 					this.cash = res.cash
 					this.has_more = res.lists.page.has_more
diff --git a/pages/wallet/withdrawList.vue b/pages/wallet/withdrawList.vue
index 17ee198..bc79abe 100644
--- a/pages/wallet/withdrawList.vue
+++ b/pages/wallet/withdrawList.vue
@@ -25,7 +25,7 @@
 				</view>
 
 			</view>
-			<!-- <view class="record-title">积分个数</view>
+			<!-- <view class="record-title">贡献值个数</view>
 			<view class="record-money"><span>￥</span>{{account || '0.00'}}</view> -->
 		</view>
 
@@ -108,7 +108,6 @@
 					date: this.date,
 				}
 				withdrawsIndexLists(data).then(res => {
-					console.log(res)
 					this.account = res.all
 					this.lists = this.lists.concat(res.lists.data)
 					this.has_next_page = res.lists.page.has_more