merge

pages/found/index.vue

@@ -99,7 +99,7 @@
 					tipsContent: '', // 弹出的动态内容
 					tipsState: false // 弹出的动态状态
 				},
-				energyShard: '' // 碎片说明
+				energyShard: '' // 积分说明
 			}
 		},
 		onShow() {

pages/verification/history.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="Record" v-if="loaded">
 		<view class="record-top">
-			<image src="/static/images/ver-bg.png" mode="widthFix" class="record-bg" />
+			<image src="/static/imgs/ver-bg.png" mode="widthFix" class="record-bg" />
 			<view class="record-top-nav">
 				<view :class="['record-top-item',type==='year'?'selectTopItem':'']" @click="selectType('year')">按年
 				</view>
@@ -33,7 +33,7 @@
 
 		<view class="boss" v-if="isBos">
 			<view class="boss-left">
-				<image src="/static/images/boss.png" mode="mode" class="boss-img">我是BOSS
+				<image src="/static/imgs/top_logo.png" mode="mode" class="boss-img">我是BOSS
 			</view>
 			<view class="boss-right" @click="shopShow = true">
 				<u-select v-model="shopShow" :list="ShopList" @confirm="shopConfirm" value-name='store_id'
@@ -167,7 +167,8 @@
 					this.ShopList = [{name:'全部',store_id:''},...res.stores]
 					this.isBos = res.isBos
 				}).catch(err => {
-					this.$refs.uToast.show({
+					console.log(err)
+					uni.showToast({
 						title: err.message,
 						type: 'error',
 						icon: false,

pages/verification/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="Verification">
-		<image class="top-img" src="/static/images/hexiao_bg.png" mode="widthFix" />
+		<image class="top-img" src="/static/imgs/hexiao_bg.png" mode="widthFix" />
 		<view class="txt">
 			<view class="title">扫描券码和权证 一键核销</view>
 			<view class="des">降低核销门槛 <span class='dian'>·</span>低成本留存优质客户</view>

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" />

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>