合并冲突

components/OrderGoods.vue

@@ -16,7 +16,7 @@
             v-if="cart.productInfo.attrInfo"
           >{{ cart.productInfo.attrInfo.sku }}</view>
           <view class="money font-color-red">￥{{ cart.truePrice }}</view>
-          <view class="evaluate" v-if="evaluate == 3" @click="routerGo(cart)">评价</view>
+          <view class="evaluate" v-if="evaluate == 3 && cart.isReply==0" @click="routerGo(cart)">评价</view>
         </view>
       </view>
     </view>

components/Recommend.vue

@@ -6,13 +6,11 @@
 			<text class="iconfont icon-zhuangshixian lefticon"></text>
 		</view>
 		<view class="recommendList acea-row row-between-wrapper">
-			<view
-				@click="routerGo(item)"
-				class="item"
-				v-for="(item, recommendIndex) in hostProduct"
-				:key="recommendIndex"
-			>
-				<view class="pictrue"><image :src="item.image" class="image" /></view>
+			<view @click="routerGo(item)" class="item" v-for="(item, recommendIndex) in hostProduct"
+				:key="recommendIndex">
+				<view class="pictrue">
+					<image :src="item.image" class="image" />
+				</view>
 				<view class="name line1">{{ item.storeName }}</view>
 				<view class="money font-color-red">
 					￥
@@ -24,14 +22,25 @@
 	</view>
 </template>
 <script>
-import { getHostProducts } from '@/api/store';
+	import {
+		getHostProducts
+	} from '@/api/store';
 	import Loading from '@/components/Loading';
 	export default {
 		name: 'Recommend',
-	props: {},
+		props: {
+			recommendLoading: Boolean
+		},
 		components: {
 			Loading
 		},
+		watch: {
+			recommendLoading(nextLoading) {
+				if (nextLoading) {
+					this.hostProducts()
+				}
+			}
+		},
 		data: function () {
 			return {
 				hostProduct: [],
@@ -47,7 +56,12 @@ export default {
 		},
 		methods: {
 			routerGo(item) {
-			this.$yrouter.push({ path: '/pages/shop/GoodsCon/index', query: { id: item.id } });
+				this.$yrouter.push({
+					path: '/pages/shop/GoodsCon/index',
+					query: {
+						id: item.id
+					}
+				});
 			},
 			hostProducts: function () {
 				let that = this;
@@ -60,11 +74,9 @@ export default {
 					that.hostProduct.push.apply(that.hostProduct, res.data);
 					that.loadend = res.data.length < that.limit; //判断所有数据是否加载完成；
 					that.page = that.page + 1;
+					this.$emit('changeRecommendLoading', false)
 				});
 			}
 		},
-	onReachBottom() {
-		!this.loading && this.hostProducts();
-	}
 	};
 </script>

manifest.json

@@ -2,7 +2,7 @@
     "name" : "yshopmall",
     "appid" : "__UNI__C7A519E",
     "description" : "",
-    "versionName" : "1.0.0",
+    "versionName" : "1.0.1",
     "versionCode" : 1,
     "transformPx" : false,
     /* 5+App特有相关 */

pages/Loading/index.vue

@@ -47,12 +47,12 @@
           cookie.set("spread", urlSpread);
         }
       }
-      // if (this.$deviceType == "app" || this.$deviceType == "weixinh5") {
-      //   this.$yrouter.switchTab({
-      //     path: "/pages/home/index"
-      //   });
-      //   return;
-      // }
+      if (this.$deviceType == "app" || this.$deviceType == "weixinh5") {
+        this.$yrouter.switchTab({
+          path: "/pages/home/index"
+        });
+        return;
+      }
       if (this.$store.getters.token) {
         // 如果token存在，直接进行进页面
         console.log('登录状态存在，直接进页面')

pages/home/components/Banner.vue

@@ -41,46 +41,14 @@
                 let item = this.detail[this.swiperCurrent];
                 // 获取轮播图颜色
                 let bgcolor = item.bgcolor;
-                // #ifdef APP-PLUS
-                that.$set(item, 'bgcolor', '#c40414');
-                that.$emit('getbgcolor', '#c40414');
-                // #endif
-                // #ifndef APP-PLUS
                 // 颜色不存在
                 if (bgcolor === '') {
-                    let ctx = uni.createCanvasContext('colorThief', that);
-                    if (0 === that.webviewId || ctx.webviewId === that.webviewId) {
-                        that.webviewId = ctx.webviewId;
-                        uni.getImageInfo({
-                            src: item.pic,
-                            success: function (image) {
-                                ctx.drawImage(image.path, 0, 0, image.width, image.height);
-                                ctx.draw(true, function (e) {
-                                    uni.canvasGetImageData({
-                                            canvasId: 'colorThief',
-                                            x: 0,
-                                            y: 0,
-                                            width: parseInt(image.width),
-                                            height: parseInt(image.height),
-                                            success(res) {
-                                                let bgcolor = colorThief(res.data)
-                                                    .color()
-                                                    .getHex();
-                                                that.$set(item, 'bgcolor', bgcolor);
-                                                that.$emit('getbgcolor', bgcolor);
-                                            }
-                                        },
-                                        that
-                                    );
-                                });
-                            }
-                        });
-                    }
+                    that.$set(item, 'bgcolor', '#c40414');
+                that.$emit('getbgcolor', '#c40414');
                 } else {
                     that.$set(item, 'bgcolor', bgcolor);
                     that.$emit('getbgcolor', bgcolor);
                 }
-                // #endif
 
             },
             swiperChange(e) {

pages/shop/GoodsCon/index.vue

@@ -308,6 +308,7 @@
     },
     computed: mapGetters(["isLogin", "location"]),
     mounted: function () {
+      this.$store.commit("get_to", "goodcon");
       let url = handleQrCode();
       if (!url) {
         url = handleUrlParam(getCurrentPageUrlWithArgs())

pages/shop/GoodsList/index.vue

@@ -3,22 +3,14 @@
     <form @submit.prevent="submitForm">
       <view class="search bg-color-red acea-row row-between-wrapper">
         <view class="input acea-row row-between-wrapper">
-          <text class="iconfont icon-sousuo"></text>
           <input placeholder="搜索商品信息" v-model="where.keyword" />
+          <text class="iconfont icon-sousuo" @click="submitForm"></text>
         </view>
-        <view
-          class="iconfont"
-          :class="Switch === true ? 'icon-pailie' : 'icon-tupianpailie'"
-          @click="switchTap"
-        ></view>
+        <view class="iconfont" :class="Switch === true ? 'icon-pailie' : 'icon-tupianpailie'" @click="switchTap"></view>
       </view>
     </form>
     <view class="nav acea-row row-middle">
-      <view
-        class="item"
-        :class="title ? 'font-color-red' : ''"
-        @click="set_where(0)"
-      >{{ title ? title : "默认" }}</view>
+      <view class="item" :class="title ? 'font-color-red' : ''" @click="set_where(0)">{{ title ? title : "默认" }}</view>
       <view class="item" @click="set_where(1)">
         价格
         <image src="@/static/images/horn.png" v-if="price === 0" />
@@ -34,19 +26,9 @@
       <!-- down -->
       <view class="item" :class="nows ? 'font-color-red' : ''" @click="set_where(3)">新品</view>
     </view>
-    <view
-      class="list acea-row row-between-wrapper"
-      :class="Switch === true ? '' : 'on'"
-      ref="container"
-    >
-      <view
-        @click="goGoodsCon(item)"
-        class="item"
-        :class="Switch === true ? '' : 'on'"
-        v-for="(item, productListIndex) in productList"
-        :key="productListIndex"
-        :title="item.storeName"
-      >
+    <view class="list acea-row row-between-wrapper" :class="Switch === true ? '' : 'on'" ref="container">
+      <view @click="goGoodsCon(item)" class="item" :class="Switch === true ? '' : 'on'"
+        v-for="(item, productListIndex) in productList" :key="productListIndex" :title="item.storeName">
         <view class="pictrue" :class="Switch === true ? '' : 'on'">
           <image :src="item.image" :class="Switch === true ? '' : 'on'" />
         </view>
@@ -64,21 +46,20 @@
       </view>
     </view>
     <Loading :loaded="loadend" :loading="loading"></Loading>
-    <view
-      class="noCommodity"
-      style="background-color: #fff;"
-      v-if="productList.length === 0 && where.page > 1"
-    >
+    <view class="noCommodity" style="background-color: #fff;" v-if="productList.length === 0 && where.page > 1">
       <view class="noPictrue">
         <image src="@/static/images/noGood.png" class="image" />
       </view>
     </view>
-    <Recommend v-if="productList.length === 0 && where.page > 1"></Recommend>
+    <Recommend v-if="productList.length === 0 && where.page > 1" :recommendLoading="recommendLoading"
+      @changeRecommendLoading="changeRecommendLoading"></Recommend>
   </view>
 </template>
 <script>
   import Recommend from "@/components/Recommend";
-import { getProducts } from "@/api/store";
+  import {
+    getProducts
+  } from "@/api/store";
   import Loading from "@/components/Loading";
 
   export default {
@@ -113,7 +94,8 @@ export default {
         loadend: false,
         price: 0,
         stock: 0,
-      nows: false
+        nows: false,
+        recommendLoading: false
       };
     },
     watch: {
@@ -139,11 +121,16 @@ export default {
       }
     },
     mounted: function () {
-    const { s = "", id = 0, title = "" } = this.$yroute.query;
+      const {
+        s = "", id = 0, title = ""
+      } = this.$yroute.query;
+      this.where.keyword = s;
+
       this.updateTitle();
       this.get_product_list();
     },
     onReachBottom() {
+      this.recommendLoading = true;
       !this.loading && this.get_product_list();
     },
     onHide() {
@@ -167,10 +154,15 @@ export default {
       // this.nows = fals;
     },
     methods: {
+      changeRecommendLoading(recommendLoading) {
+        this.recommendLoading = recommendLoading
+      },
       goGoodsCon(item) {
         this.$yrouter.push({
           path: "/pages/shop/GoodsCon/index",
-        query: { id: item.id }
+          query: {
+            id: item.id
+          }
         });
       },
       updateTitle() {
@@ -180,9 +172,10 @@ export default {
         var that = this;
         this.setWhere();
         // if (to.name !== "GoodsList") return;
-      const { s = "", id = 0, title = "" } = this.$yroute.query;
+        const {
+          s = "", id = 0, title = ""
+        } = this.$yroute.query;
         if (s !== this.where.keyword || id !== this.where.sid) {
-        this.where.keyword = s;
           this.loadend = false;
           this.loading = false;
           this.where.page = 1;
@@ -214,7 +207,9 @@ export default {
         let that = this;
         switch (index) {
           case 0:
-          return that.$yrouter.push({ path: "/pages/shop/GoodsClass/index" });
+            return that.$yrouter.push({
+              path: "/pages/shop/GoodsClass/index"
+            });
           case 1:
             if (that.price === 0) that.price = 1;
             else if (that.price === 1) that.price = 2;

unpackage/resources/__UNI__C7A519E/www/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__C7A519E","name":"yshopmall","version":{"name":"1.0.0","code":1},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"OAuth":{},"Payment":{},"Share":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"usingComponents":true,"nvueCompiler":"uni-app","compilerVersion":3,"allowsInlineMediaPlayback":true,"safearea":{"background":"#ffffff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"2.6.8","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#282828","selectedColor":"#00c17b","borderStyle":"rgba(0,0,0,0.4)","backgroundColor":"#ffffff","height":"50px","fontSize":"10px","iconWidth":"24px","spacing":"3px","list":[{"pagePath":"pages/home/index","iconPath":"static/icon-home.png","selectedIconPath":"static/icon-home-hot.png","text":"首页"},{"pagePath":"pages/shop/GoodsClass/index","iconPath":"static/icon-class.png","selectedIconPath":"static/icon-class-hot.png","text":"分类"},{"pagePath":"pages/shop/ShoppingCart/index","iconPath":"static/icon-cart.png","selectedIconPath":"static/icon-cart-hot.png","text":"购物车"},{"pagePath":"pages/user/User/index","iconPath":"static/icon-user.png","selectedIconPath":"static/icon-user-hot.png","text":"我的"}]},"launch_path":"__uniappview.html"}}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__C7A519E","name":"yshopmall","version":{"name":"1.0.0","code":1},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"OAuth":{},"Payment":{},"Share":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":false,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"usingComponents":true,"nvueCompiler":"uni-app","compilerVersion":3,"allowsInlineMediaPlayback":true,"safearea":{"background":"#ffffff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"2.8.3","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#282828","selectedColor":"#eb3729","borderStyle":"rgba(0,0,0,0.4)","backgroundColor":"#ffffff","height":"50px","fontSize":"10px","iconWidth":"24px","spacing":"3px","list":[{"pagePath":"pages/home/index","iconPath":"static/icon-home.png","selectedIconPath":"static/icon-home-hot.png","text":"首页"},{"pagePath":"pages/shop/GoodsClass/index","iconPath":"static/icon-class.png","selectedIconPath":"static/icon-class-hot.png","text":"分类"},{"pagePath":"pages/shop/ShoppingCart/index","iconPath":"static/icon-cart.png","selectedIconPath":"static/icon-cart-hot.png","text":"购物车"},{"pagePath":"pages/user/User/index","iconPath":"static/icon-user.png","selectedIconPath":"static/icon-user-hot.png","text":"我的"}]},"launch_path":"__uniappview.html"}}