update

.env.development

@@ -1,3 +1,3 @@
-VUE_APP_API_URL = http://localhost:8080/api
+VUE_APP_API_URL = http://192.168.3.20:8080/api
 VUE_APP_UPDATE_URL = https://qndownload.shotshock.shop/version
 VUE_APP_SHARE_URL = https://twong.shotshock.shop/mobilex/share

.idea/inspectionProfiles/Project_Default.xml

@@ -2,5 +2,24 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="HtmlUnknownTag" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="myValues">
+        <value>
+          <list size="7">
+            <item index="0" class="java.lang.String" itemvalue="nobr" />
+            <item index="1" class="java.lang.String" itemvalue="noembed" />
+            <item index="2" class="java.lang.String" itemvalue="comment" />
+            <item index="3" class="java.lang.String" itemvalue="noscript" />
+            <item index="4" class="java.lang.String" itemvalue="embed" />
+            <item index="5" class="java.lang.String" itemvalue="script" />
+            <item index="6" class="java.lang.String" itemvalue="yd-progressbar" />
+          </list>
+        </value>
+      </option>
+      <option name="myCustomValuesEnabled" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ShellCheck" enabled="true" level="ERROR" enabled_by_default="true">
+      <shellcheck_settings value="SC2120" />
+    </inspection_tool>
   </profile>
 </component>

cordova/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/x.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,12 +7,12 @@
 		<key>Cordova.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>1</integer>
 		</dict>
 		<key>CordovaLib.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>2</integer>
 		</dict>
 	</dict>
 </dict>

cordova/platforms/ios/美天旺/Entitlements-Debug.plist

@@ -4,7 +4,9 @@
 <dict>
 	<key>aps-environment</key>
 	<string>development</string>
+	<key>com.apple.developer.associated-domains</key>
+	<array/>
 	<key>com.apple.security.application-groups</key>
 	<array/>
 </dict>
-</plist>
+</plist>

cordova/platforms/ios/美天旺/Entitlements-Release.plist

@@ -4,7 +4,9 @@
 <dict>
 	<key>aps-environment</key>
 	<string>production</string>
+	<key>com.apple.developer.associated-domains</key>
+	<array/>
 	<key>com.apple.security.application-groups</key>
 	<array/>
 </dict>
-</plist>
+</plist>

package.json

@@ -4,8 +4,10 @@
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint"
+    "serve-pub": "vue-cli-service serve --mode production",
+    "lint": "vue-cli-service lint",
+    "build-pub": "vue-cli-service build",
+    "build-dev": "vue-cli-service build --mode development"
   },
   "dependencies": {
     "animate.css": "^3.7.2",

src/api/public.js

@@ -120,3 +120,7 @@ export function follow() {
 export function getCity() {
   return request.get("/city_list", {}, { login: false });
 }
+
+export function getRank(id = 1) {
+  return request.get("/api/boards/" + id, { login: false });
+}

src/components/GoodItem.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div v-if="isVip">
+    <div>
       <div class="money font-color-red">
         <span class="iconfont icon-huiyuan" style="font-size: 0.3rem"></span
         ><span class="num" style="font-size: 0.3rem">
@@ -14,36 +14,35 @@
         ></span>
         ¥ {{ item.price }}
       </div>
-      <div
-        class="num font-color-green"
-        style="height: 0.4rem; font-size: 0.3rem"
-      >
-        <span
-          class="addfont icon-Icon-zhuan font-color-red"
-          style="font-size: 0.3rem"
-        ></span>
-        ¥ {{ getPrice() }}
-      </div>
-    </div>
-    <div v-else>
-      <div class="money font-color-red">
-        ¥<span class="num">{{ item.price }}</span>
-      </div>
-      <div class="ot-money" style="text-decoration:line-through;">
-        ¥{{ item.ot_price }}
-      </div>
+<!--      <div-->
+<!--        class="num font-color-green"-->
+<!--        style="height: 0.4rem; font-size: 0.3rem"-->
+<!--      >-->
+<!--        <span-->
+<!--          class="addfont icon-Icon-zhuan font-color-red"-->
+<!--          style="font-size: 0.3rem"-->
+<!--        ></span>-->
+<!--        ¥ {{ getPrice() }}-->
+<!--      </div>-->
     </div>
+<!--    <div v-else>-->
+<!--      <div class="money font-color-red">-->
+<!--        ¥<span class="num">{{ item.price }}</span>-->
+<!--      </div>-->
+<!--      <div class="ot-money" style="text-decoration:line-through;">-->
+<!--        ¥{{ item.ot_price }}-->
+<!--      </div>-->
+<!--    </div>-->
   </div>
 </template>
 
 <script>
 import { formatRMB } from "@utils";
 export default {
-
   name: "GoodItem",
   props: {
-    item: {},
-    isVip: false
+    item: {}
+    // isVip: false
   },
   data: function() {
     return {};

src/components/News.vue

@@ -2,19 +2,20 @@
   <div class="news acea-row row-between-wrapper">
     <div class="pictrue"><img src="@assets/images/news.png" /></div>
     <div class="swiper-no-swiping new-banner">
-      <swiper v-swiper:
-          class="swiper-wrapper"
-          :options="swiperRoll"
-          ref="rollSwiper"
+      <swiper
+        v-swiper:
+        class="swiper-wrapper"
+        :options="swiperRoll"
+        ref="rollSwiper"
       >
         <swiper-slide
-            class="swiper-slide"
-            v-for="(item, index) in roll"
-            :key="index"
+          class="swiper-slide"
+          v-for="(item, index) in roll"
+          :key="index"
         >
           <router-link
-              :to="item.wap_url ? item.wap_url : ''"
-              class="acea-row row-between-wrapper"
+            :to="item.wap_url ? item.wap_url : ''"
+            class="acea-row row-between-wrapper"
           >
             <div class="text acea-row row-between-wrapper">
               <div class="label" v-if="item.show === '是'">最新</div>
@@ -34,10 +35,11 @@ export default {
   name: "News",
   props: {
     roll: [],
+    node: {}
   },
   components: {
     swiper,
-    swiperSlide,
+    swiperSlide
   },
   watch: {
     $route(n) {
@@ -64,6 +66,19 @@ export default {
     };
   },
 
+  mounted() {
+    console.log("register");
+    const that = this;
+    this.node.$on("over", (start) => {
+      // if(that.$refs.rollSwiper.swiper.autoplay.running === start) return;
+      if(start) {
+        that.$refs.rollSwiper.swiper.autoplay.start();
+      } else {
+        that.$refs.rollSwiper.swiper.autoplay.stop();
+      }
+    });
+  },
+
   methods: {
   }
 };
@@ -72,9 +87,9 @@ export default {
 <style>
 .news{height:0.77rem;border-top:1px solid #f4f4f4;padding:0 0.3rem;box-shadow:0 0.1rem 0.3rem #f5f5f5;
   -webkit-box-shadow:0 0.1rem 0.3rem #f5f5f5;-moz-box-shadow:0 0.1rem 0.3rem #f5f5f5;-o-box-shadow:0 0.1rem 0.3rem #f5f5f5;}
-.news .pictrue{width:1.24rem;height:0.28rem;border-right:1px solid #ddd;padding-right:0.23rem;box-sizing:content-box;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;}
+.news .pictrue{width:0.64rem;height:0.28rem;border-right:1px solid #ddd;padding-right:0.23rem;box-sizing:content-box;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;}
 .news .pictrue img{width:100%;height:100%;display:block;}
-.news .new-banner{width:5.23rem;overflow:hidden;height:0.77rem;}
+.news .new-banner{width:5.63rem;overflow:hidden;height:0.77rem;}
 .news .new-banner .swiper-slide{height:100%;}
 .news .new-banner .text{width:4.8rem;height:0.77rem;}
 .news .new-banner .text .label{font-size:0.2rem;color:#ff4c48;width:0.68rem;height:0.34rem;border-radius:0.2rem;

src/components/RankList.vue

@@ -0,0 +1,28 @@
+<template>
+  <div class="RankList">
+  </div>
+</template>
+
+<script>
+import { getRank } from "@api/public";
+
+export default {
+  name: "RankList",
+  props: {
+  },
+  data:function () {
+    return {
+
+    }
+  },
+  mounted() {
+    getRank().then((res) => {
+      console.log(res);
+    });
+  }
+};
+</script>
+
+<style scoped>
+.RankList {}
+</style>

src/views/home/Index.vue

@@ -91,7 +91,7 @@
                 <div>积分中心</div>
               </router-link>
             </div>
-            <News :roll="roll"></News>
+            <News :roll="roll" :node="this"></News>
             <div class="scroll-coupon" v-if="getCouponList.length">
               <swiper :options="swiperScroll">
                 <swiper-slide
@@ -750,16 +750,17 @@ export default {
   },
   watch: {
     tapActive(to) {
-      console.log(to);
       if (to === 0) {
         this.tapActive = 0;
         this.swiper.autoplay.start();
         this.newSwiper.autoplay.start();
         this.recommendSwiper.autoplay.start();
+        this.$emit("over", true);
       } else {
         this.swiper.autoplay.stop();
         this.newSwiper.autoplay.stop();
         this.recommendSwiper.autoplay.stop();
+        this.$emit("over", false);
       }
     },
     $route(n) {

src/views/shop/GoodsCon.vue

@@ -55,11 +55,11 @@
               v-if="storeInfo.vip_price && storeInfo.vip_price > 0"
             /> -->
           </div>
-          <div
-            v-if="!isVip"
-            class="iconfont icon-fenxiang"
-            @click="listenerActionSheet"
-          ></div>
+<!--          <div-->
+<!--            v-if="!isVip"-->
+<!--            class="iconfont icon-fenxiang"-->
+<!--            @click="listenerActionSheet"-->
+<!--          ></div>-->
         </div>
         <div class="introduce">{{ storeInfo.store_name }}</div>
         <div class="label acea-row row-between-wrapper">
@@ -272,17 +272,17 @@
         </div>
         <div>购物车</div>
       </router-link>
-      <div class="acea-row" :class="isVip ? 'bnt' : 'bnt_no'">
+      <div class="acea-row bnt">
         <div class="joinCart" @click="joinCart">加入购物车</div>
         <div class="buy" @click="tapBuy" v-if="attr.productSelect.stock > 0">
           立即购买
         </div>
         <div class="buy bg-color-hui" v-else>已售罄</div>
-        <div class="share" v-if="isVip" @click="listenerActionSheet">
-          <div class="top">分享</div>
-          <div class="down">
-            赚:￥{{ formatMoney(storeInfo.price - storeInfo.vip_price) }}
-          </div>
+        <div class="share" style="margin-left: 0.1rem;width: 1.4rem" @click="listenerActionSheet">
+          <div>分享</div>
+<!--          <div class="down">-->
+<!--            赚:￥{{ formatMoney(storeInfo.price - storeInfo.vip_price) }}-->
+<!--          </div>-->
         </div>
       </div>
     </div>

src/views/user/promotion/UserCash.vue

@@ -76,6 +76,7 @@
           </div>
         </div>
         <div class="tip">当前可提现金额: {{ commissionCount }}</div>
+<!--        <div class="tip">提示: 500 元以下需支付 0.6% 手续费</div>-->
         <div class="bnt bg-color-red" @click="submitted">提现</div>
       </div>
       <div :hidden="currentTab !== 1" class="list">
@@ -104,6 +105,7 @@
           </div>
         </div>
         <div class="tip">当前可提现金额: {{ commissionCount }}</div>
+<!--        <div class="tip">提示: 500 元以下需支付 0.6% 手续费</div>-->
         <div class="bnt bg-color-red" @click="submitted">提现</div>
       </div>
     </div>

vue.config.js

@@ -46,21 +46,19 @@ module.exports = {
       return args;
     });
   },
+  // devServer: {
+  //   proxy: {
+  //     "/api": {
+  //       target: "http://twong.h/api", //代理地址，这里设置的地址会代替axios中设置的baseURL
+  //       changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
+  //     }
+  //   }
+  // },
   devServer: {
-    host: "localhost", //target host
-    port: 8080,
-    //proxy:{'/api':{}},代理器中设置/api,项目中请求路径为/api的替换为target
     proxy: {
       "/api": {
-        target: "http://twong.h", //代理地址，这里设置的地址会代替axios中设置的baseURL
-        changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
-        //ws: true, // proxy websockets
-        //pathRewrite方法重写url
-        pathRewrite: {
-          "^/api": "/api"
-          //pathRewrite: {'^/api': '/'} 重写之后url为 http://192.168.1.16:8085/xxxx
-          //pathRewrite: {'^/api': '/api'} 重写之后url为 http://192.168.1.16:8085/api/xxxx
-        }
+        target: "http://twong.h",
+        changeOrigin: true
       }
     }
   }