Merge branch 'master' of https://gitee.com/he2802/saas_applet

pages2/bank/my_question.vue

@@ -17,7 +17,7 @@
 				<view class="bottomBox">
 					<view class="box_progress">
 						<view style="width: 60%;">
-							<u-line-progress active-color="#007AFF" :percent="item.doNum/item.totalNum"></u-line-progress>
+							<u-line-progress :show-percent="false" active-color="#007AFF" :percent="item.doNum/item.totalNum"></u-line-progress>
 						</view>
 						<view>
 							<!-- <navigator :url="'/pages2/bank/question_detail?id='+item.goodsId"> -->

pages2/order/confirm_pay.vue

@@ -108,6 +108,7 @@ export default {
 			this.$api.placeSmallOrder(data).then(res => {
 				self.btnNo = false
 				if(res.data.code==200){
+					uni.setStorageSync('updateCart',1) //提醒刷新购物车
 					let data = res.data.data
 					uni.requestPayment({
 					    provider: data.provider,

pages2/wd/class.vue

@@ -26,7 +26,7 @@
 					学习进度：{{ item.stuAllNum }}/{{ item.secAllNum }}
 				</view>
 				<view class="box_progress">
-					<view style="width: 60%;"><u-line-progress :showText="false" active-color="#ff9900" :percent="(item.stuAllNum / item.secAllNum) * 100"></u-line-progress></view>
+					<view style="width: 60%;"><u-line-progress :showText="false" active-color="#ff9900" :show-percent="false" :percent="(item.stuAllNum / item.secAllNum) * 100"></u-line-progress></view>
 					<view><u-button type="warning" size="mini" @click.stop="studyIn(item.goodsId)">进入学习</u-button></view>
 				</view>
 				<view class="box_progress" v-if="item.applyStatus === 1">