Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

components/goods/list.vue

@@ -6,16 +6,16 @@
           <view class="good-img">
             <image
               mode="aspectFill"
-              :src="cx.CoverImage"
+              :src="cx.cover_pic"
               style="width: 100%; height: 100%;"
             />
           </view>
-          <view class="good-name" v-if="setting.is_show_goods_name=='1'">{{ cx.Name }}</view>
+          <view class="good-name" v-if="setting.is_show_goods_name=='1'">{{ cx.name }}</view>
           <view class="good-info">
             <view class="price" :style="{ color: mainColor }">
-			￥{{cx.SellingPrice}}</view>
+			￥{{cx.price}}</view>
 			<!-- v-if="setting.is_show_sales_num=='1'" -->
-            <view class="sell">已售{{ cx.SalesNum }}</view>
+            <view class="sell">{{ cx.sales }}</view>
             <view v-if="setting.is_show_cart=='1'" class="cart" @click.stop="showSkuHandler(cx)">
               <u-icon name="cart-o" size="40" :color="mainColor" />
             </view>
@@ -65,11 +65,11 @@ export default {
   },
   methods: {
     initConfig() {
-      this.setting = uni.getStorageSync("basedata").mall.setting
+      this.setting = uni.getStorageSync("basedata").setting
     },
     clickHandler(item) {
 		console.log("GoodsId",item)
-      uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.Id });
+      uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.id });
     },
     showSkuHandler(g) {
       this.sku = g;

components/goods/style1.vue

@@ -10,7 +10,7 @@
       v-for="(item, gli) in goodList"
       :key="gli"
       class="good-one"
-      @click="openGood(item.page_url)"
+      @click="openGood(item)"
       :style="{
         border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '',
         background:
@@ -107,10 +107,8 @@ export default {
     this.mainColor = this.$uiConfig.mainColor;
   },
   methods: {
-    openGood(url) {
-      uni.navigateTo({
-         url: url
-      });
+    openGood(item) {
+       uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.id});
     },
     showSkuHandler(g){
       this.sku=g

components/goods/style2.vue

@@ -11,7 +11,7 @@
       <u-col span="6" v-for="(item, gli) in goodList" :key="gli">
         <view
           class="good-two"
-          @click="openGood"
+          @click="openGood(item)"
           :style="{
             border:
               goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '',
@@ -103,8 +103,8 @@ export default {
     this.mainColor = this.$uiConfig.mainColor;
   },
   methods: {
-    openGood(e) {
-      console.log(e);
+    openGood(item) {
+       uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.id});
     },
   },
 };

components/goods/style3.vue

@@ -13,7 +13,7 @@
         v-for="(item, gli) in goodList"
         :key="gli"
       >
-        <div class="good-three" @click="openGood(item.page_url)" :style="{
+        <div class="good-three" @click="openGood(item)" :style="{
             border:
               goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '',
             background:
@@ -110,10 +110,8 @@ export default {
     this.mainColor = this.$uiConfig.mainColor;
   },
   methods: {
-    openGood(url) {
-      uni.navigateTo({
-         url: url
-      });
+    openGood(item) {
+       uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.id});
     },
     showSkuHandler(g){
       this.sku=g

components/goods/style4.vue

@@ -11,7 +11,7 @@
       class="good-four"
       v-for="(item, gli) in goodList"
       :key="gli"
-      @click="openGood(item.page_url)"
+      @click="openGood(item)"
       :style="{
         border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '',
         background:
@@ -99,14 +99,12 @@ export default {
     this.mainColor = this.$uiConfig.mainColor;
   },
   methods: {
-    openGood(url) {
-      uni.navigateTo({
-         url: url
-      });
+    openGood(item) {
+	   uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.id});
     },
     showSkuHandler(g){
       this.sku=g
-      this.showSku=true
+      this.showSku=true 
     },
 	//格式化价格添加.00
 	// getPrice(value){

components/goods/style5.vue

@@ -9,7 +9,7 @@
   >
     <view
       class="good-five"
-      @click="openGood"
+      @click="openGood(item)"
       v-for="(item, gli) in goodList"
       :key="gli"
       :style="{
@@ -100,8 +100,8 @@ export default {
     this.mainColor = this.$uiConfig.mainColor;
   },
   methods: {
-    openGood(e) {
-      console.log(e);
+    openGood(item) {
+       uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.id});
     },
 	showSkuHandler(g){
 	  this.sku=g

components/goods/style6.vue

@@ -11,7 +11,7 @@
       class="good-four"
       v-for="(item, gli) in goodList"
       :key="gli"
-      @click="openGood"
+      @click="openGood(item)"
       :style="{
         border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '',
         background:
@@ -92,8 +92,8 @@ export default {
     this.mainColor = this.$uiConfig.mainColor;
   },
   methods: {
-    openGood(e) {
-      console.log(e);
+    openGood(item) {
+       uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.id});
     },
   },
 };

pages/goods/goods.vue

@@ -231,7 +231,9 @@ export default {
       isExsitGoods: true,
       pageTitle: "商品详情",
       setting:{},
-      prevPage:""
+      prevPage:"",
+	  //自定义接手传递
+	  opTionObj:{}
     };
   },
   components: {
@@ -241,12 +243,14 @@ export default {
     auth,
   },
   onLoad(option) {
-    this.id = option.id ? option.id : 46942; //40887 59512 46942
+	console.log(option,'optionnnn');
+	this.opTionObj=option;
+    this.id = option.GoodsId ? option.GoodsId : 46942; //40887 59512 46942
     this.init();
     this.mc = this.$uiConfig.mainColor;
     this.secondary = this.$uiConfig.secondary;
     this.initPage();
-    this.setting = uni.getStorageSync("basedata").mall.setting
+    this.setting = uni.getStorageSync("basedata").setting
   },
   methods: {
     initPage() {
@@ -271,17 +275,16 @@ export default {
     },
     init() {
       this.loading = true;
-      this.request(
+      this.request2(
         {
-          url: "",
+          url: "/api/AppletGoods/GetAppletGoodsInfo",
           data: {
-            r: "api/goods/detail",
-            id: this.id,
+            GoodsId: this.opTionObj.GoodsId
           },
         },
         (res) => {
-          console.log(res);
-          if (res.code == 0) {
+          console.log(res,'详情');
+          if (res.resultCode == 1) {
             this.g = res.data.goods;
             this.g.pic_url.forEach((x) => {
               this.imgs.push(x.pic_url);
@@ -303,6 +306,7 @@ export default {
             this.detailContent = richtext;
             this.loading = false;
             this.initComments();
+			this.initRecommend();
           } else {
             this.isExsitGoods = false;
           }
@@ -343,22 +347,20 @@ export default {
         },
         (res) => {
           this.comments = res.data;
-          this.initRecommend();
+          // this.initRecommend();
         }
       );
     },
     initRecommend() {
-      this.request(
+      this.request2(
         {
-          url: "",
+          url: "/api/AppletGoods/GetAppletGoodsRecommendListForZY",
           data: {
-            r: "api/goods/new-recommend",
-            goods_id: this.id,
-            type: "goods",
+            RecommendType: 1,
           },
         },
         (res) => {
-          this.recommend = res.data.list;
+          this.recommend = res.data.List;
         }
       );
     },

pages/order/index/index.vue

@@ -8,8 +8,8 @@
     <view style="padding: 10px 0; background: #fff;">
       <u-tabs
         :list="list"
-        :is-scroll="false"
         :current="current"
+		name="Name"
         @change="change"
         :active-color="mainColor"
         bg-color="#FFF"
@@ -221,15 +221,7 @@ export default {
     return {
       pageTitle: "我的订单",
       current: 0,
-      list: [
-        { name: "全部" },
-        { name: "待付款" },
-        { name: "待发货" },
-        { name: "待收货" },
-        { name: "待评价" },
-        // { name: "已完成" },
-        // { name: "已取消" },
-      ],
+      list: [],
       mainColor: "",
       contentHeight: 0,
       page: 1,
@@ -252,6 +244,17 @@ export default {
         padding: "0 30rpx",
       },
       template_message: [],
+	  msg:{
+		  pageIndex:1,
+		  pageSize:15,
+		  OrderId:0,
+		  OrderType:0,
+		  DeliveryMethod:0,
+		  StartTime:'',
+		  EndTime:'',
+		  OrderStatus:0,
+		  OrderNo:'',
+	  },
     };
   },
   created() {
@@ -280,8 +283,30 @@ export default {
     this.current = option.status || -1;
     this.loading = true;
     this.init();
+	this.getOrderStatus();
   },
   methods: {
+	  getOrderStatus() {
+	  		this.request2(
+	  			{
+	  				url: '/api/order/GetOrderStatusEnumList',
+	  				data: {}
+	  			},
+	  			res => {
+	  				uni.hideNavigationBarLoading();
+	  				if(res.resultCode==1){
+	  					this.isloading = false;
+	  					this.list = res.data;
+	  					let obj={
+	  						Name:'全部',
+	  						Id:0,
+	  					}
+	  					this.list.unshift(obj)
+						console.log("this.list",this.list)
+	  				}
+	  			}
+	  		);
+	  	},
     redirectToDetail(id) {
       uni.navigateTo({
         url: "/pages/order/order-detail?id=" + id,
@@ -315,43 +340,61 @@ export default {
       });
     },
     change(index) {
-      this.current = index;
-      this.page = 1;
-      this.g = [];
-      this.loading = true;
-      this.init();
+		this.current = index;
+		this.msg.OrderStatus=this.list[index].Id;
+		this.msg.pageIndex = 1;
+		this.g = [];
+		this.loading = true;
+		this.init();
     },
     init() {
       this.isover = false;
       let h = this.apiheader();
-      this.request(
-        {
-          url: "",
-          header: h,
-          data: {
-            r: "api/order/list",
-            status: this.current,
-            page: this.page,
-          },
-        },
-        (res) => {
-          this.loading = false;
-          this.g = this.g.concat(res.data.list);
-          this.template_message = res.data.template_message;
-          this.page_count = res.data.pagination.page_count;
-          if (this.page_count == 1) {
-            this.isover = true;
-          }
-        }
-      );
+	  this.request2(
+		{
+			url: '/api/AppletOrder/GetAppletGoodsMyOrderPageList',
+			data: this.msg
+		},
+		res => {
+			uni.hideNavigationBarLoading();
+			if(res.resultCode==1){
+				this.loading = false;
+				this.g = this.g.concat(res.data.pageData);
+				this.page_count = res.data.page_count;
+				if (this.page_count == 1) {
+				  this.isover = true;
+				}
+			}
+		}
+	  );
+      // this.request(
+      //   {
+      //     url: "",
+      //     header: h,
+      //     data: {
+      //       r: "api/order/list",
+      //       status: this.current,
+      //       page: this.page,
+      //     },
+      //   },
+      //   (res) => {
+      //     this.loading = false;
+      //     this.g = this.g.concat(res.data.list);
+      //     this.template_message = res.data.template_message;
+      //     this.page_count = res.data.pagination.page_count;
+      //     if (this.page_count == 1) {
+      //       this.isover = true;
+      //     }
+      //   }
+      // );
     },
     lower(e) {
-      if (this.page < this.page_count) {
-        this.page++;
-        this.init();
-      } else {
-        this.isover = true;
-      }
+      if (this.msg.pageIndex < this.page_count) {
+		  this.msg.pageIndex++;
+		  this.init();
+		} else {
+		  this.isover = true;
+		}
     },
     cancel(e, index) {
       this.showModal = true;

pages/search/search.vue

@@ -166,18 +166,17 @@ export default {
     this.mainColor = this.$uiConfig.mainColor;
   },
   methods: {
+	//为你推荐
     initRecommend() {
-      this.request(
+      this.request2(
         {
-          url: "",
+          url: "/api/AppletGoods/GetAppletGoodsRecommendListForZY",
           data: {
-            r: "api/goods/new-recommend",
-            goods_id: 0,
-            type: "goods",
+            RecommendType:1
           },
         },
         (res) => {
-          this.recommedGoods = res.data.list;
+          this.recommedGoods = res.data.List;
         }
       );
     },
@@ -249,20 +248,23 @@ export default {
       this.isover = false;
       this.loading = true;
       this.showLoading = this.page != 1;
-      this.request(
+      this.request2(
         {
-          url: "",
+          url: "/api/AppletGoods/GetAppletGoodsPageListForZY",
           data: {
-            r: "api/default/goods-list",
-            page: this.page,
-            keyword: this.searchKey,
-            sign: "",
+			pageIndex:1,
+			pageSize:20,
+		    Name:this.searchKey,
+			GoodsType:0,
+			CategoryIds:'',
+			OrderBy:1
           },
         },
         (res) => {
+			console.log(res,'搜索ress');
           this.showLoading = true;
-          this.g = this.g.concat(res.data.list);
-          this.page_count = res.data.pagination.page_count;
+          this.g = this.g.concat(res.data.pageData);
+          this.page_count = res.data.page_count;
           if (this.page_count == 1) {
             this.isover = true;
             this.status = "nomore";