Merge branch 'feature_20250910_建议订单跳转购物车' into release

src/views/deviceOutside/index.vue

@@ -357,53 +357,64 @@
             <div class="btnbox">
               <van-row>
                 <van-col
-                  span="5"
+                  span="4"
                   v-if="item.stateString != '已拜访' && customerVisits"
                   @click="storeVisit(item)">
-                  <img :src="call" style="margin: 0 auto; height: 18px; display: block" />
-                  <p style="text-align: center; margin: 0; font-size: 12px">进入拜访</p>
+                  <img :src="call" style="margin: 0 auto; height: 15px; display: block" />
+                  <p style="text-align: center; margin: 0; font-size: 11px">进入拜访</p>
                 </van-col>
                 <van-col
-                  span="5"
+                  span="4"
                   v-if="item.storeCategory == '公装经销商'"
                   @click="projectOutVisit(item)">
-                  <img :src="xmgj" style="margin: 0 auto; height: 18px; display: block" />
-                  <p style="text-align: center; margin: 0; font-size: 12px">项目跟进</p>
+                  <img :src="xmgj" style="margin: 0 auto; height: 15px; display: block" />
+                  <p style="text-align: center; margin: 0; font-size: 11px">项目跟进</p>
                 </van-col>
                 <van-col
-                  span="5"
+                  span="4"
                   v-if="
                     item.stateString != '已拜访' &&
                     item.storeCategory != '公装经销商' &&
                     customerVisits
                   "
                   @click="abnormalVisit(item)">
-                  <img :src="yichang" style="margin: 0 auto; height: 18px; display: block" />
-                  <p style="text-align: center; margin: 0; margin-top: 1px; font-size: 12px">
+                  <img :src="yichang" style="margin: 0 auto; height: 15px; display: block" />
+                  <p style="text-align: center; margin: 0; margin-top: 1px; font-size: 11px">
                     异常拜访
                   </p>
                 </van-col>
-                <van-col span="4" v-if="item.showOrderButton" @click="orderFn(item)">
-                  <img :src="xiadan" style="margin: 0 auto; height: 18px; display: block" />
-                  <p style="text-align: center; margin: 0; margin-top: 1px; font-size: 12px">
+                <van-col
+                  span="4"
+                  v-if="item.storeLabels.zysslNums !== false"
+                  @click="linkList(item)">
+                  <img
+                    :src="require('@/assets/recommendicon.png')"
+                    style="margin: 0 auto; height: 15px; display: block" />
+                  <p style="text-align: center; margin: 0; margin-top: 1px; font-size: 11px">
+                    推荐下单
+                  </p>
+                </van-col>
+                <van-col span="4" v-else-if="item.showOrderButton" @click="orderFn(item)">
+                  <img :src="xiadan" style="margin: 0 auto; height: 15px; display: block" />
+                  <p style="text-align: center; margin: 0; margin-top: 1px; font-size: 11px">
                     去下单
                   </p>
                 </van-col>
-                <van-col span="5" v-if="item.stateString == '已拜访'" @click="Visit(item)">
-                  <img :src="bfxx" style="margin: 0 auto; height: 18px; display: block" />
-                  <p style="text-align: center; margin: 0; margin-top: 1px; font-size: 12px">
+                <van-col span="4" v-if="item.stateString == '已拜访'" @click="Visit(item)">
+                  <img :src="bfxx" style="margin: 0 auto; height: 15px; display: block" />
+                  <p style="text-align: center; margin: 0; margin-top: 1px; font-size: 11px">
                     拜访信息
                   </p>
                 </van-col>
-                <van-col span="5" @click="visitFn(item)">
-                  <img :src="kehuxinxi" style="margin: 0 auto; width: 18px; display: block" />
-                  <p style="text-align: center; margin: 0; margin-top: 1px; font-size: 12px">
+                <van-col span="4" @click="visitFn(item)">
+                  <img :src="kehuxinxi" style="margin: 0 auto; width: 15px; display: block" />
+                  <p style="text-align: center; margin: 0; margin-top: 1px; font-size: 11px">
                     客户信息
                   </p>
                 </van-col>
-                <van-col span="5" v-if="tabVal == 1" @click="storeJoinVisit(item)">
-                  <img :src="jiarujihua" style="margin: 0 auto; height: 18px; display: block" />
-                  <p style="text-align: center; margin: 0; font-size: 12px">加入计划内</p>
+                <van-col span="4" v-if="tabVal == 1" @click="storeJoinVisit(item)">
+                  <img :src="jiarujihua" style="margin: 0 auto; height: 15px; display: block" />
+                  <p style="text-align: center; margin: 0; font-size: 11px">加入计划内</p>
                 </van-col>
               </van-row>
             </div>

src/views/deviceOutside/productItem.vue

@@ -55,7 +55,7 @@ export default {
   data() {
     return {
       list: [],
-      tabVal: '0',
+      tabVal: '1',
       detail: null,
       timeData: '',
       showOrderButton: 'false',
@@ -63,7 +63,7 @@ export default {
   },
   activated() {
     this.showOrderButton = this.$route.query.showOrderButton || 'false';
-    this.tabVal = '0';
+    this.tabVal = '1';
     buryingPoint({
       systemModel: '门店列表',
       buryingPointType: 6,
@@ -178,7 +178,7 @@ export default {
       }).then((res) => {
         loading1.clear();
         if (res.code == 200 && res.data) {
-          window.location.href = res.data;
+          window.location.href = res.data + '&state=#/tab/cart';
         } else {
           this.Toast({
             message: res.msg,

src/views/deviceWithin/index.vue

@@ -348,22 +348,21 @@
           <div class="btnbox">
             <van-row>
               <van-col
-                span="6"
+                span="4"
                 v-if="item.stateString != '已拜访' && item.visitAble && customerVisits"
                 @click="storeVisit(item)">
-                <img :src="call" style="margin: 0 auto; height: 18px; display: block" />
-                <p style="text-align: center; margin: 0">进入拜访</p>
+                <img :src="call" style="margin: 0 auto; height: 15px; display: block" />
+                <p style="text-align: center; margin: 0; font-size: 11px">进入拜访</p>
               </van-col>
               <van-col
-                span="6"
+                span="4"
                 v-if="item.storeCategory == '公装经销商'"
                 @click="projectOutVisit(item)">
-                <img :src="xmgj" style="margin: 0 auto; height: 18px; display: block" />
-                <p style="text-align: center; margin: 0">项目跟进</p>
-                <!--                  <van-button type="info" size="small" plain  class="centerBtn" @click="signAdd(item)">大客户签约</van-button>-->
+                <img :src="xmgj" style="margin: 0 auto; height: 15px; display: block" />
+                <p style="text-align: center; margin: 0; font-size: 11px">项目跟进</p>
               </van-col>
               <van-col
-                span="6"
+                span="4"
                 v-if="
                   item.stateString != '已拜访' &&
                   item.visitAble &&
@@ -371,20 +370,36 @@
                   customerVisits
                 "
                 @click="abnormalVisit(item)">
-                <img :src="yichang" style="margin: 0 auto; height: 18px; display: block" />
-                <p style="text-align: center; margin: 0; margin-top: 1px">异常拜访</p>
+                <img :src="yichang" style="margin: 0 auto; height: 15px; display: block" />
+                <p style="text-align: center; margin: 0; margin-top: 1px; font-size: 11px">
+                  异常拜访
+                </p>
               </van-col>
-              <van-col span="6" v-if="item.showOrderButton" @click="orderFn(item)">
-                <img :src="xiadan" style="margin: 0 auto; height: 18px; display: block" />
-                <p style="text-align: center; margin: 0; margin-top: 1px">去下单</p>
+              <van-col span="4" v-if="item.storeLabels.zysslNums !== false" @click="linkList(item)">
+                <img
+                  :src="require('@/assets/recommendicon.png')"
+                  style="margin: 0 auto; height: 15px; display: block" />
+                <p style="text-align: center; margin: 0; margin-top: 1px; font-size: 11px">
+                  推荐下单
+                </p>
+              </van-col>
+              <van-col span="4" v-else-if="item.showOrderButton" @click="orderFn(item)">
+                <img :src="xiadan" style="margin: 0 auto; height: 15px; display: block" />
+                <p style="text-align: center; margin: 0; margin-top: 1px; font-size: 11px">
+                  去下单
+                </p>
               </van-col>
-              <van-col span="6" v-if="item.stateString == '已拜访'" @click="Visit(item)">
-                <img :src="bfxx" style="margin: 0 auto; height: 18px; display: block" />
-                <p style="text-align: center; margin: 0; margin-top: 1px">拜访信息</p>
+              <van-col span="4" v-if="item.stateString == '已拜访'" @click="Visit(item)">
+                <img :src="bfxx" style="margin: 0 auto; height: 15px; display: block" />
+                <p style="text-align: center; margin: 0; margin-top: 1px; font-size: 11px">
+                  拜访信息
+                </p>
               </van-col>
-              <van-col span="6" @click="visitFn(item)">
-                <img :src="kehuxinxi" style="margin: 0 auto; height: 18px; display: block" />
-                <p style="text-align: center; margin: 0; margin-top: 1px">客户信息</p>
+              <van-col span="4" @click="visitFn(item)">
+                <img :src="kehuxinxi" style="margin: 0 auto; height: 15px; display: block" />
+                <p style="text-align: center; margin: 0; margin-top: 1px; font-size: 11px">
+                  客户信息
+                </p>
               </van-col>
             </van-row>
           </div>