Merge branch 'dev1.0.0' into develop

pages/login.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-22 15:36:46
  * @LastEditors: ch
- * @LastEditTime: 2022-04-09 14:52:24
+ * @LastEditTime: 2022-04-15 18:45:28
  * @Description: file content
 -->
 <template>
@@ -25,7 +25,7 @@
 		</u--form>
 		<UiButton class="login--btn" type="gradual" @click="login">登录</UiButton>
 		<label class="login--agreement">
-			<radio class="radio" :checked="checked" @click="checked = !checked" color="$color-yellow3"/>
+			<radio class="radio" :checked="checked" @click="checked = !checked" color="#FF875B"/>
 			同意<text class="link">《用户协议》</text>和<text class="link">《隐私协议》</text>,首次登陆将自动注册
 		</label>
 	</view>

pages/order/detail/index.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-31 14:26:09
  * @LastEditors: ch
- * @LastEditTime: 2022-04-15 18:04:08
+ * @LastEditTime: 2022-04-15 18:42:30
  * @Description: file content
 -->
 <template>
@@ -13,7 +13,8 @@
 				v-for="(item, index) in orderInfo.products" :data="item" :key="index">
 				<template slot="operation">
 					<view class="goods-info-operation">
-						<UiButton size="min" type="primaryLine" 
+						<UiButton size="min" type="primaryLine"
+							v-if="item.afterSaleApplyFlag" 
 							@click="$Router.push(`/saleAfterSelect?id=${item.orderProductId}`)">申请售后</UiButton>
 					</view>
 				</template>