Merge branch 'release' into uat(dev)

# Conflicts:
#	src/api/index.js

src/api/index.js

@@ -1040,19 +1040,19 @@ export function deleteSummaryMobile(query) {
   });
 }
 
-// 发送验证码并校验验证码
-export function sendAndCheckVerCode(query) {
+// sku识别信息接口
+export function getSkuDetailById(query) {
   return request({
-    url: '/mobile/storeGroup/sendAndCheckVerCode',
+    url: '/mobile/reportMobile/getSkuDetailById',
     method: 'get',
     params: query,
   });
 }
 
-// sku识别信息接口
-export function getSkuDetailById(query) {
+// 发送验证码并校验验证码
+export function sendAndCheckVerCode(query) {
   return request({
-    url: '/mobile/reportMobile/getSkuDetailById',
+    url: '/mobile/storeGroup/sendAndCheckVerCode',
     method: 'get',
     params: query,
   });

src/views/deviceOutside/productItem.vue

@@ -2,7 +2,7 @@
   <div class="bgcolor productItem">
     <div class="navBarTOP">
       <van-nav-bar class="navBar" title="产品列表" left-arrow @click-left="onClickLeft">
-        <template #right v-if="showOrderButton">
+        <template #right v-if="showOrderButton == 'true'">
           <span style="color: #0057ba" @click="placeOrderFn"> 去下单 </span>
         </template>
       </van-nav-bar>
@@ -58,11 +58,11 @@ export default {
       tabVal: '0',
       detail: null,
       timeData: '',
-      showOrderButton: false,
+      showOrderButton: 'false',
     };
   },
   activated() {
-    this.showOrderButton = this.$route.query.showOrderButton || false;
+    this.showOrderButton = this.$route.query.showOrderButton || 'false';
     this.tabVal = '0';
     buryingPoint({
       systemModel: '门店列表',

src/views/historicalVisit/skuRecognize.vue

@@ -13,7 +13,7 @@
     </van-nav-bar>
     <div class="content" v-if="detail">
       <div class="title">产品陈列照</div>
-      <div class="tipsTitle">{{ detail.skuDescribe }}</div>
+      <div class="tipsTitle">目前识别桶装和战略产品合计106个，后续会增加识别产品数</div>
       <div>
         <van-row gutter="10">
           <van-col span="4" v-for="(urls, index) in detail.fileUrlList" :key="index">