Browse Source

修改测试BUG

shenjj 7 years ago
parent
commit
050e16105d
1 changed files with 68 additions and 73 deletions
  1. 68 73
      components/mobile/store/StoreDetail.vue

+ 68 - 73
components/mobile/store/StoreDetail.vue

@@ -11,75 +11,73 @@
         <!--<span :class="activeType=='detail'?'mobile-switch-btn active':'mobile-switch-btn'" @click="activeType='detail'">介绍</span>-->
       <!--</div>-->
     </div>
-    <div class="mobile-modal" @touchmove.self="preventTouchMove($event)" v-show="activeType==='detail'">
-      <div class="mobile-modal-box mobile-link-en mobile-link-en-content">
-        <div class="mobile-modal-header">企业信息|{{store.storeName}}<i @click="activeType = 'store'" class="icon-guanbi iconfont"></i></div>
-        <div class="store-info" >
-      <div class="store-description">
-        <h4>主营产品</h4>
-        <p class="content" v-if="store.description">
-          {{store.description}}
-        </p>
-        <div class="com-none-state" v-else>
-          <p>抱歉,暂无主营产品信息</p>
+    <modal-wrapper :showModal="activeType==='detail'" :title="'企业信息'|store.storeName" @closeAction="activeType=''">
+      <div class="store-info" >
+        <div class="store-description">
+          <h4>主营产品</h4>
+          <p class="content" v-if="store.description">
+            {{store.description}}
+          </p>
+          <div class="com-none-state" v-else>
+            <p>抱歉,暂无主营产品信息</p>
+          </div>
         </div>
-      </div>
-      <div class="store-description">
-        <h4>应用领域</h4>
-        <p class="content" v-if="store.storeApplication">
-          {{store.storeApplication}}
-        </p>
-        <div class="com-none-state" v-else>
-          <p>抱歉,暂无应用领域信息</p>
+        <div class="store-description">
+          <h4>应用领域</h4>
+          <p class="content" v-if="store.storeApplication">
+            {{store.storeApplication}}
+          </p>
+          <div class="com-none-state" v-else>
+            <p>抱歉,暂无应用领域信息</p>
+          </div>
         </div>
-      </div>
-      <div class="store-description">
-        <h4>企业介绍</h4>
-        <p class="content" v-if="store.enterprise.description">
-          {{store.enterprise.description}}
-        </p>
-        <div class="com-none-state" v-else>
-          <p>抱歉,暂无企业介绍</p>
+        <div class="store-description">
+          <h4>企业介绍</h4>
+          <p class="content" v-if="store.enterprise.description">
+            {{store.enterprise.description}}
+          </p>
+          <div class="com-none-state" v-else>
+            <p>抱歉,暂无企业介绍</p>
+          </div>
+        </div>
+        <div class="contact-info">
+          <h4>联系我们</h4>
+          <ul class="list-unstyled clearfix">
+            <li>
+              <div>电&nbsp;&nbsp;话:</div>
+              <div v-if="store.enterprise.enTel"><a :href="'tel:' + store.enterprise.enTel" @click="clickTel = true" :class="{'click-tel': clickTel}">{{store.enterprise.enTel}}</a></div>
+              <div v-else><span>-</span></div>
+            </li>
+            <li>
+              <div>传&nbsp;&nbsp;真:</div>
+              <div v-if="store.enterprise.enFax"> {{store.enterprise.enFax}}</div>
+              <div v-else><span>-</span></div>
+            </li>
+            <li>
+              <div>手&nbsp;&nbsp;机:</div>
+              <div v-if="store.enterprise.enPhone"> <a :href="'tel:' + store.enterprise.enPhone" @click="clickPhone = true" :class="{'click-phone': clickPhone}">{{store.enterprise.enPhone}}</a></div>
+              <div v-else><span>-</span></div>
+            </li>
+            <li>
+              <div>微&nbsp;&nbsp;信:</div>
+              <div v-if="store.enterprise.enWeixin"> {{store.enterprise.enWeixin}}</div>
+              <div v-else><span>-</span></div>
+            </li>
+            <li>
+              <div>Q&nbsp;&nbsp;&nbsp;Q:</div>
+              <div v-if="store.enterprise.enQQ"> {{store.enterprise.enQQ.trim()}}</div>
+              <div v-else>-</div>
+            </li>
+            <!-- <li>
+               <div>店铺地址:</div>
+               <div v-if="store.enterprise.address">{{store.enterprise.address}}</div>
+               <div v-else><span>-</span></div>
+             </li>-->
+          </ul>
         </div>
       </div>
-     <div class="contact-info">
-      <h4>联系我们</h4>
-      <ul class="list-unstyled clearfix">
-        <li>
-          <div>电&nbsp;&nbsp;话:</div>
-          <div v-if="store.enterprise.enTel"><a :href="'tel:' + store.enterprise.enTel" @click="clickTel = true" :class="{'click-tel': clickTel}">{{store.enterprise.enTel}}</a></div>
-          <div v-else><span>-</span></div>
-        </li>
-        <li>
-          <div>传&nbsp;&nbsp;真:</div>
-          <div v-if="store.enterprise.enFax"> {{store.enterprise.enFax}}</div>
-          <div v-else><span>-</span></div>
-        </li>
-        <li>
-          <div>手&nbsp;&nbsp;机:</div>
-          <div v-if="store.enterprise.enPhone"> <a :href="'tel:' + store.enterprise.enPhone" @click="clickPhone = true" :class="{'click-phone': clickPhone}">{{store.enterprise.enPhone}}</a></div>
-          <div v-else><span>-</span></div>
-        </li>
-        <li>
-          <div>微&nbsp;&nbsp;信:</div>
-          <div v-if="store.enterprise.enWeixin"> {{store.enterprise.enWeixin}}</div>
-          <div v-else><span>-</span></div>
-        </li>
-        <li>
-          <div>Q&nbsp;&nbsp;&nbsp;Q:</div>
-          <div v-if="store.enterprise.enQQ"> {{store.enterprise.enQQ.trim()}}</div>
-          <div v-else>-</div>
-        </li>
-       <!-- <li>
-          <div>店铺地址:</div>
-          <div v-if="store.enterprise.address">{{store.enterprise.address}}</div>
-          <div v-else><span>-</span></div>
-        </li>-->
-      </ul>
-     </div>
-    </div>
-      </div>
-    </div>
+    </modal-wrapper>
+
   <!--  <div class="com-none-state" v-if="activeType=='detail'">
       <img src="/images/mobile/@2x/empty-collect.png">
       <p>抱歉,暂无店铺简介</p>
@@ -203,6 +201,7 @@
 </template>
 <script>
   import {RemindBox, LoginBox, PullUp, EmptyStatus} from '~components/mobile/common'
+  import { ModalWrapper } from '~components/mobile/base'
   export default {
     data () {
       return {
@@ -228,7 +227,8 @@
       RemindBox,
       LoginBox,
       PullUp,
-      EmptyStatus
+      EmptyStatus,
+      ModalWrapper
     },
     filters: {
       currency: function (num) {
@@ -394,10 +394,10 @@
   }
   .mobile-modal .mobile-link-en-content {
     width: 7.04rem;
-    margin-top: 0rem;
+    margin-top: 0 !important;
     left: 0.2rem;
     background: #f7f7f7;
-    top: 5%;
+    top: 5% !important;
   }
   .store-detail {
     margin: 0 auto;
@@ -471,10 +471,6 @@
     }
     .store-info {
       background: #f7f7f7;
-      width: 100%;
-      bottom: 0;
-      overflow-y: scroll;
-      height: 9rem;
       h4{
         width: 100%;
         text-align: left;
@@ -499,7 +495,6 @@
       }
       .contact-info{
         background: #fff;
-        width: 6.96rem;
         margin: .2rem auto;
         border-radius: .1rem;
         ul{