add

5 years ago · e215701560
216 changed files with 11668 additions and 13914 deletions
--- a/assets/css/base.less
+++ b/assets/css/base.less
@ -17,19 +17,19 @@
 }
 /* padding20 */
 .padding20 {
-  padding: 0.2rem;
+  padding: 0.2*3.125rem;
 }
 /* pad20 */
 .pad20 {
-  padding: 0 0.2rem;
+  padding: 0 0.2*3.125rem;
 }
 /* padding30 */
 .padding30 {
-  padding: 0.3rem;
+  padding: 0.3*3.125rem;
 }
 /*pad30 */
 .pad30 {
-  padding: 0 0.3rem;
+  padding: 0 0.3*3.125rem;
 }
 /* layout */
 .acea-row {
@ -102,29 +102,29 @@
  height: 100%;
 }
 .start {
-  width: 1.22rem;
-  height: 0.3rem;
+  width: 1.22*3.125rem;
+  height: 0.3*3.125rem;
  background-image: url("https://h5.dayouqiantu.cn/static/images/start.png");
  background-repeat: no-repeat;
-  background-size: 1.22rem auto;
+  background-size: 1.22*3.125rem auto;
 }
 .start.star5 {
-  background-position: 0 0.03rem;
+  background-position: 0 0.03*3.125rem;
 }
 .start.star4 {
-  background-position: 0 -0.3rem;
+  background-position: 0 -0.3*3.125rem;
 }
 .start.star3 {
-  background-position: 0 -0.7rem;
+  background-position: 0 -0.7*3.125rem;
 }
 .start.star2 {
-  background-position: 0 -1.05rem;
+  background-position: 0 -1.05*3.125rem;
 }
 .start.star1 {
-  background-position: 0 -1.4rem;
+  background-position: 0 -1.4*3.125rem;
 }
 .start.star0 {
-  background-position: 0 -1.75rem;
+  background-position: 0 -1.75*3.125rem;
 }
 /* 单选框和多选框 */
 .checkbox-wrapper {
@ -148,20 +148,20 @@
  background-color: #e93323;
  border-color: #e93323;
  background-image: url("https://h5.dayouqiantu.cn/static/images/enter.png");
-  background-size: 0.21rem 0.15rem;
+  background-size: 0.21*3.125rem 0.15*3.125rem;
  background-repeat: no-repeat;
  background-position: center center;
 }
 .Loads {
-  height: 0.8rem;
-  font-size: 0.25rem;
+  height: 0.8*3.125rem;
+  font-size: 0.25*3.125rem;
  color: #000;
 }
 .Loads .iconfont {
-  font-size: 0.3rem;
-  margin-right: 0.1rem;
-  height: 0.32rem;
-  line-height: 0.32rem;
+  font-size: 0.3*3.125rem;
+  margin-right: 0.1*3.125rem;
+  height: 0.32*3.125rem;
+  line-height: 0.32*3.125rem;
 }
 /*加载动画*/
@keyframes load {
--- a/assets/css/reset.less
+++ b/assets/css/reset.less
@ -7,7 +7,7 @@ input{line-height: normal; box-sizing:border-box;}
  display: none;
 }
 .iconfont{
-  font-size: .36rem;
+  font-size: .36*3.125rem;
 }
 /* 一像素边框 */
@media (-webkit-min-device-pixel-ratio: 1.5), (min-device-pixel-ratio: 1.5) {
--- a/assets/css/style.less
+++ b/assets/css/style.less
--- a/components/AddressWindow.vue
+++ b/components/AddressWindow.vue
@ -65,7 +65,7 @@ export default {
      this.$emit("input", false);
    },
    goAddressPages: function() {
-      this.$yrouter.push({ path: "/pages/user/address/AddAddress/main" });
+      this.$yrouter.push({ path: "/pages/user/address/AddAddress/index" });
      this.$emit("redirect");
    },
    tapAddress: function(index) {
--- a/components/Footer.vue
+++ b/components/Footer.vue
@ -31,25 +31,25 @@ export default {
          name: "首页",
          icon1: "icon-shouye-xianxing",
          icon2: "icon-shouye",
-          url: "/pages/home/main"
+          url: "/pages/home/index"
        },
        {
          name: "分类",
          icon1: "icon-yingyongchengxu-xianxing",
          icon2: "icon-yingyongchengxu",
-          url: "/pages/shop/GoodsClass/main"
+          url: "/pages/shop/GoodsClass/index"
        },
        {
          name: "购物车",
          icon1: "icon-caigou-xianxing",
          icon2: "icon-caigou",
-          url: "/pages/shop/ShoppingCart/main"
+          url: "/pages/shop/ShoppingCart/index"
        },
        {
          name: "我的",
          icon1: "icon-yonghu-xianxing",
          icon2: "icon-yonghu",
-          url: "/pages/user/User/main"
+          url: "/pages/user/User/index"
        }
      ],
      isIpx: false
--- a/components/GoodList.vue
+++ b/components/GoodList.vue
@ -1,11 +1,6 @@
 <template>
 	<div class="goodList">
-    <div
-      @click="$yrouter.push({ path: '/pages/shop/GoodsCon/index',query:{id:item.id} })"
-      class="item acea-row row-between-wrapper"
-      v-for="(item, goodlistIndex) in goodList"
-      :key="goodlistIndex"
-    >
+		<div @click="routerGo(item)" class="item acea-row row-between-wrapper" v-for="(item, goodlistIndex) in goodList" :key="goodlistIndex">
 			<div class="pictrue">
 				<img :src="item.image" class="image" />
 				<img :src="$VUE_APP_RESOURCES_URL + '/images/one.png'" class="numPic" v-if="isSort === true && index === 0" />
@ -20,10 +15,7 @@
 						<span class="num">{{ item.price }}</span>
 					</div>
 					<div class="vip-money acea-row row-middle">
-            <div class="vip">
-              ￥{{ item.otPrice || 0
-              }}
-            </div>
+						<div class="vip">￥{{ item.otPrice || 0 }}</div>
 						<span class="num">已售{{ item.sales }}{{ item.unitName }}</span>
 					</div>
 				</div>
@ -47,6 +39,11 @@ export default {
  },
  data: function() {
    return {};
+  },
+  methods:{
+	  routerGo(item) {
+	  	this.$yrouter.push({ path: '/pages/shop/GoodsCon/index', query: { id: item.id } });
+	  }
  }
 };
 </script>
--- a/components/Home.vue
+++ b/components/Home.vue
@ -1,39 +1,34 @@
 <template>
-  <div
-    class="home"
-    :style="{ top: top + 'px' }"
-    style="position:fixed;"
-    id="right-nav"
-    @touchmove="touchmove($event)"
-  >
+	<div class="home" :style="{ top: top + 'px' }" style="position:fixed;" id="right-nav" @touchmove="touchmove($event)">
 		<div class="homeCon bg-color-red1" :class="homeActive === true ? 'on' : ''">
-      <div
-        @click="$yrouter.switchTab('/pages/home/index')"
-        class="iconfont icon-shouye-xianxing "
-        style="color: green;"
-      ></div>
-      <div
-        @click="$yrouter.switchTab('/pages/shop/ShoppingCart/index')"
-        class="iconfont icon-caigou-xianxing"
-        style="color: green;"
-      ></div>
-      <!--<div @click="$yrouter.push('/pages/user/User/index'" class="iconfont icon-yonghu1"></div>-->
+			<div @click="homeGo()" class="iconfont icon-shouye-xianxing " style="color: green;"></div>
+			<div @click="shoppingCartGo()" class="iconfont icon-caigou-xianxing" style="color: green;"></div>
+			<!--<div @click="userGo()" class="iconfont icon-yonghu1"></div>-->
 		</div>
 	</div>
 </template>
 <script>
-import { mapGetters } from "vuex";
+import { mapGetters } from 'vuex';
 export default {
-  name: "Home",
+	name: 'Home',
 	props: {},
 	data: function() {
 		return {
-      top: "",
+			top: '',
 			homeActive: true
 		};
 	},
-  computed: mapGetters(["homeActive"]),
+	computed: mapGetters(['homeActive']),
 	methods: {
+		userGo() {
+			this.$yrouter.push('/pages/user/User/index');
+		},
+		homeGo() {
+			this.$yrouter.switchTab('/pages/home/index');
+		},
+		shoppingCartGo() {
+			this.$yrouter.switchTab('/pages/shop/ShoppingCart/index');
+		},
 		touchmove(event) {
 			// event.preventDefault();
 			// let top =
@ -46,9 +41,7 @@ export default {
 			this.top = 55;
 		},
 		open: function() {
-      this.homeActive
-        ? this.$store.commit("CLOSE_HOME")
-        : this.$store.commit("OPEN_HOME");
+			this.homeActive ? this.$store.commit('CLOSE_HOME') : this.$store.commit('OPEN_HOME');
 		}
 	}
 };
--- a/components/OrderGoods.vue
+++ b/components/OrderGoods.vue
@ -19,7 +19,7 @@
          <div
            class="evaluate"
            v-if="evaluate == 3"
-            @click="$yrouter.push({ path: '/pages/shop/GoodsEvaluate/index',query:{id:cart.unique} })"
+			@click="routerGo(cart)"
          >评价</div>
        </div>
      </div>
@ -40,6 +40,10 @@ export default {
    return {};
  },
  mounted: function() {},
-  methods: {}
+  methods: {
+	  routerGo(item) {
+	  	this.$yrouter.push({ path: '/pages/shop/GoodsEvaluate/index',query:{id:cart.unique} });
+	  },
+  }
 };
 </script>
--- a/components/PromotionGood.vue
+++ b/components/PromotionGood.vue
@ -1,14 +1,7 @@
 <template>
 	<div class="promotionGood" v-if="benefit.length > 0">
-    <div
-      @click="$yrouter.push({ path: '/pages/shop/GoodsCon/index',query:{id:item.id} })"
-      class="item acea-row row-between-wrapper"
-      v-for="(item, promotionGoodIndex) in benefit"
-      :key="promotionGoodIndex"
-    >
-      <div class="pictrue">
-        <img :src="item.image" class="image" />
-      </div>
+		<div class="item acea-row row-between-wrapper" v-for="(item, promotionGoodIndex) in benefit" :key="promotionGoodIndex" @click="routerGo(item)">
+			<div class="pictrue"><img :src="item.image" class="image" /></div>
 			<div class="text">
 				<div class="name line1">{{ item.storeName }}</div>
 				<div class="sp-money acea-row">
@ -27,15 +20,18 @@
 </template>
 <script>
 export default {
-  name: "PromotionGood",
-  props: {
-    benefit: {
-      type: Array,
-      default: () => []
-    }
-  },
+	name: 'PromotionGood',
+	props: ['benefit'],
 	data: function() {
 		return {};
+	},
+	methods: {
+		routerGo(item) {
+			this.$yrouter.push({ path: '/pages/shop/GoodsCon/index', query: { id: item.id } });
+		}
+	},
+	mounted() {
+		console.log(this, 999);
 	}
 };
 </script>
--- a/components/Recommend.vue
+++ b/components/Recommend.vue
@ -7,14 +7,12 @@
 		</div>
 		<div class="recommendList acea-row row-between-wrapper">
 			<div
-        @click="$yrouter.push({ path: '/pages/shop/GoodsCon/index',query:{id:item.id} })"
+				@click="routerGo(item)"
 				class="item"
 				v-for="(item, recommendIndex) in hostProduct"
 				:key="recommendIndex"
 			>
-        <div class="pictrue">
-          <img :src="item.image" class="image" />
-        </div>
+				<div class="pictrue"><img :src="item.image" class="image" /></div>
 				<div class="name line1">{{ item.storeName }}</div>
 				<div class="money font-color-red">
 					￥
@ -26,10 +24,10 @@
 	</div>
 </template>
 <script>
-import { getHostProducts } from "@/api/store";
-import Loading from "@/components/Loading";
+import { getHostProducts } from '@/api/store';
+import Loading from '@/components/Loading';
 export default {
-  name: "Recommend",
+	name: 'Recommend',
 	props: {},
 	components: {
 		Loading
@ -39,7 +37,7 @@ export default {
 			hostProduct: [],
 			page: 1,
 			limit: 20,
-      loadTitle: "",
+			loadTitle: '',
 			loading: false,
 			loadend: false
 		};
@ -48,6 +46,9 @@ export default {
 		this.hostProducts();
 	},
 	methods: {
+		routerGo(item) {
+			this.$yrouter.push({ path: '/pages/shop/GoodsCon/index', query: { id: item.id } });
+		},
 		hostProducts: function() {
 			let that = this;
 			if (that.loading) return; //阻止下次请求（false可以进行请求）；
--- a/components/SwitchWindow.vue
+++ b/components/SwitchWindow.vue
@ -119,24 +119,24 @@ export default {
    },
    switchH5() {
      let that = this;
-      wx.showLoading({title: '正在切换中'})
+      uni.showLoading({title: '正在切换中'})
      if (that.login_type === "h5") {
        cookie.set("loginType", "wechat", 60);
-        wx.hideLoading()
+        uni.hideLoading()
        this.$store.commit("LOGOUT");
        this.$emit("changeswitch", false);
        location.reload();
      } else {
        switchH5Login()
          .then(({ data }) => {
-            wx.hideLoading()
+            uni.hideLoading()
            const expires_time = dayjs(data.expires_time);
            store.commit("LOGIN", data.token, expires_time);
            this.$emit("changeswitch", false);
            location.reload();
          })
          .catch(err => {
-            wx.hideLoading()
+            uni.hideLoading()
            return that.$dialog.toast({ mes: err });
          });
      }
--- a/libs/order.js
+++ b/libs/order.js
@ -4,20 +4,20 @@ import { weappPay } from "@/libs/wechat";

 export function cancelOrderHandle(orderId) {
  return new Promise((resolve, reject) => {
-    wx.showModal({
+    uni.showModal({
      title: '提示',
      content: '确认取消该订单?',
      success(res) {
        if (res.confirm) {
          cancelOrder(orderId)
            .then(res => {
-              wx.showToast({
+              uni.showToast({
                title: '取消成功', icon: 'success', duration: 2000
              });
              resolve(res);
            })
            .catch(err => {
-              wx.showToast({
+              uni.showToast({
                title: '取消失败', icon: 'none', duration: 2000
              });
              reject(err);
@ -33,13 +33,13 @@ export function takeOrderHandle(orderId) {
  return new Promise((resolve, reject) => {
    takeOrder(orderId)
      .then(res => {
-        wx.showToast({
+        uni.showToast({
          title: '收货成功', icon: 'success', duration: 2000
        });
        resolve(res);
      })
      .catch(err => {
-        wx.showToast({
+        uni.showToast({
          title: '收货失败', icon: 'none', duration: 2000
        });
        reject(err);
@ -54,13 +54,13 @@ export function delOrderHandle(orderId) {
      opts() {
        delOrder(orderId)
          .then(res => {
-            wx.showToast({
+            uni.showToast({
              title: '删除成功', icon: 'success', duration: 2000
            });
            resolve(res);
          })
          .catch(err => {
-            wx.showToast({
+            uni.showToast({
              title: '删除失败', icon: 'none', duration: 2000
            });
            reject(err);
@ -72,11 +72,11 @@ export function delOrderHandle(orderId) {

 export function payOrderHandle(orderId, type, from) {
  return new Promise((resolve, reject) => {
-    wx.showLoading({ title: '加载中' })
+    uni.showLoading({ title: '加载中' })
    payOrder(orderId, type, from)
      .then(res => {
        const data = res.data;
-        wx.hideLoading()
+        uni.hideLoading()
        switch (data.status) {
          case "WECHAT_H5_PAY":
            location.replace(data.result.jsConfig.mweb_url);
@ -90,7 +90,7 @@ export function payOrderHandle(orderId, type, from) {
            reject(data);
            break;
          case "SUCCESS":
-            wx.showToast({ title: res.msg, icon: 'none', duration: 2000 });
+            uni.showToast({ title: res.msg, icon: 'none', duration: 2000 });
            resolve(data);
            break;
          case "WECHAT_PAY":
@ -100,7 +100,7 @@ export function payOrderHandle(orderId, type, from) {
        }
      })
      .catch(err => {
-        wx.hideLoading()
+        uni.hideLoading()
        dialog.toast({ mes: "订单支付失败" });
      });
  });
--- a/libs/wechat.js
+++ b/libs/wechat.js
@ -6,13 +6,13 @@ export const weappPay = (option) => {
      ...option,
      timeStamp: option.timeStamp + '',
      success: (success) => {
-        wx.showToast({
+        uni.showToast({
          title: '支付成功', icon: 'success', duration: 2000
        });
        resolve(success)
      },
      fail: (error) => {
-        wx.showToast({ title: '支付失败', icon: 'none', duration: 2000 });
+        uni.showToast({ title: '支付失败', icon: 'none', duration: 2000 });
        reject(error)
      }
    })
--- a/main.js
+++ b/main.js
@ -12,9 +12,9 @@ import cookie from "@/utils/store/cookie";
 import "@/assets/iconfont/iconfont.css";
 // import "@/assets/js/media_750";
 // import "vue-ydui/dist/ydui.base.css";
-import "@/assets/css/base.css";
-import "@/assets/css/reset.css";
-import "@/assets/css/style.css";
+import "@/assets/css/base.less";
+import "@/assets/css/reset.less";
+import "@/assets/css/style.less";

 import {
 	parseRoute,
@ -76,17 +76,27 @@ Object.defineProperty(Vue.prototype, '$yroute', {
 	}
 })

-Object.defineProperty(Vue.prototype, '$VUE_APP_RESOURCES_URL', {
-	get() {
-		return VUE_APP_RESOURCES_URL
-	}
-})
+Vue.prototype.$VUE_APP_RESOURCES_URL = VUE_APP_RESOURCES_URL
+Vue.prototype.$VUE_APP_API_URL = VUE_APP_API_URL

-Object.defineProperty(Vue.prototype, '$VUE_APP_API_URL', {
-	get() {
-		return VUE_APP_API_URL
-	}
-})
+// #ifdef APP-PLUS
+// App平台编译的代码
+Vue.prototype.$deviceType = 'App'
+Vue.prototype.$platform = uni.getSystemInfoSync().platform
+// #endif
+
+// #ifndef H5
+// H5编译的代码
+Vue.prototype.$deviceType = 'H5'
+// #endif

+// #ifdef MP-WEIXIN
+// 微信小程序编译的代码
+Vue.prototype.$deviceType = 'Weixin'
+// #endif
+
+if(wx){
+	Vue.prototype.$deviceType = 'Weixin'
+}

 app.$mount()
--- a/manifest.json
+++ b/manifest.json
@ -57,11 +57,12 @@
    "quickapp" : {},
    /* 小程序特有相关 */
    "mp-weixin" : {
-        "appid" : "",
+        "appid" : "wx604d2ea4702620d2",
        "setting" : {
            "urlCheck" : false
        },
-        "usingComponents" : true
+        "usingComponents" : true,
+        "permission" : {}
    },
    "mp-alipay" : {
        "usingComponents" : true
--- a/pages/Loading/index.vue
+++ b/pages/Loading/index.vue
@ -30,12 +30,12 @@ export default {
 				cookie.set('spread', urlSpread || 0);
 			}
 		}
-		this.toLaunch();
-		// login({
-		// 	fail: () => {
 		// this.toLaunch();
-		// 	}
-		// });
+		login({
+			fail: () => {
+				this.toLaunch();
+			}
+		});
 	},
 	methods: {
 		...mapActions(['changeAuthorization', 'changeUserInfo']),
--- a/pages/NotDefined/index.vue
+++ b/pages/NotDefined/index.vue
@ -9,7 +9,7 @@
      >
    </div>

-    <div class="btn" @click="$yrouter.replace({ path: '/' })">
+    <div class="btn" @click="homeGo()">
      返回首页
    </div>
  </div>
@ -17,7 +17,12 @@

 <script>
 export default {
-  name: "NotDefined"
+  name: "NotDefined",
+  methods: {
+    homeGo() {
+			this.$yrouter.switchTab('/pages/home/index');
+		},
+  },
 };
 </script>

--- a/pages/activity/BargainRecord/index.vue
+++ b/pages/activity/BargainRecord/index.vue
@ -75,13 +75,13 @@ export default {
  methods: {
    goDetail: function(id) {
      this.$yrouter.push({
-        path: "/pages/activity/DargainDetails/main",
+        path: "/pages/activity/DargainDetails/index",
        query: { id, partake: 0 }
      });
    },
    goList: function() {
      this.$yrouter.push({
-        path: "/pages/activity/GoodsBargain/main"
+        path: "/pages/activity/GoodsBargain/index"
      });
    },
    getBargainUserList: function() {
@ -96,7 +96,7 @@ export default {
          that.loadingList = false;
        })
        .catch(res => {
-           wx.showToast({
+           uni.showToast({
                          title: res.msg,
                          icon: "none",
                          duration: 2000
@ -107,7 +107,7 @@ export default {
      var that = this;
      getBargainUserCancel({ bargainId: bargainId })
        .then(res => {
-          wx.showToast({
+          uni.showToast({
            title: res.msg,
            icon: "success",
            duration: 2000
@ -119,7 +119,7 @@ export default {
          that.getBargainUserList();
        })
        .catch(res => {
-           wx.showToast({
+           uni.showToast({
                          title: res.msg,
                          icon: "none",
                          duration: 2000
--- a/pages/activity/DargainDetails/index.vue
+++ b/pages/activity/DargainDetails/index.vue
@ -248,7 +248,7 @@ export default {
      ) {
        that.bargainPartake = that.userInfo.uid;
        // that.$yrouter.push({
-        //   path: "/pages/activity/DargainDetails/main",
+        //   path: "/pages/activity/DargainDetails/index",
        //   query: { id: that.bargainId, partake: that.bargainPartake }
        // });
      } else {
@ -274,7 +274,7 @@ export default {
      postCartAdd(data)
        .then(res => {
          that.$yrouter.push({
-            path: "/pages/order/OrderSubmission/main",
+            path: "/pages/order/OrderSubmission/index",
            query: { id: res.data.cartId }
          });
        })
@ -286,13 +286,13 @@ export default {
      var that = this;
      that.getBargainShare(that.bargainId);
      this.$yrouter.push({
-        path: "/pages/activity/Poster/main",
+        path: "/pages/activity/Poster/index",
        query: { id: that.bargainId, type: 2 }
      });
    },
    goList: function() {
      this.$yrouter.push({
-        path: "/pages/activity/GoodsBargain/main"
+        path: "/pages/activity/GoodsBargain/index"
      });
    },
    //砍价分享
@ -317,7 +317,7 @@ export default {
          that.getBargainHelpCount();
        })
        .catch(res => {
-          wx.showToast({
+          uni.showToast({
            title: res.msg,
            icon: "none",
            duration: 2000
@ -333,7 +333,7 @@ export default {
          that.getBargainHelp();
        })
        .catch(res => {
-          wx.showToast({
+          uni.showToast({
            title: res.msg,
            icon: "none",
            duration: 2000
@ -347,7 +347,7 @@ export default {
        that.surplusPrice === 0 &&
        that.bargainPartake !== that.userInfo.uid
      ) {
-        return wx.showToast({
+        return uni.showToast({
          title: "好友已经砍价成功",
          icon: "success",
          duration: 2000
@ -372,7 +372,7 @@ export default {
          that.getBargainHelpPrice();
        })
        .catch(res => {
-          wx.showToast({
+          uni.showToast({
            title: res.msg,
            icon: "none",
            duration: 2000
@ -399,7 +399,7 @@ export default {
          }
        })
        .catch(res => {
-          wx.showToast({
+          uni.showToast({
            title: res.msg,
            icon: "none",
            duration: 2000
@ -425,7 +425,7 @@ export default {
          that.bargainHelpList.push.apply(that.bargainHelpList, res.data);
        })
        .catch(res => {
-          wx.showToast({
+          uni.showToast({
            title: res.msg,
            icon: "none",
            duration: 2000
@ -441,7 +441,7 @@ export default {
        .then(() => {})
        .catch(() => {
          // that.$yrouter.push({
-          //   path: "/pages/activity/DargainDetails/main",
+          //   path: "/pages/activity/DargainDetails/index",
          //   query: { id: that.bargainId, partake: that.userInfo.uid }
          // });
        });
@ -463,7 +463,7 @@ export default {
        .catch(() => {
          that.bargainPartake = that.userInfo.uid;
          // that.$yrouter.push({
-          //   path: "/pages/activity/DargainDetails/main",
+          //   path: "/pages/activity/DargainDetails/index",
          //   query: { id: that.bargainId, partake: that.userInfo.uid }
          // });
        });
@ -479,7 +479,7 @@ export default {
          that.getBargainHelpList();
        })
        .catch(res => {
-          wx.showToast({
+          uni.showToast({
            title: res.msg,
            icon: "none",
            duration: 2000
@ -492,7 +492,7 @@ export default {
  },
  onShareAppMessage() {
    return {
-      path: `/pages/activity/DargainDetails/main/?id=${
+      path: `/pages/activity/DargainDetails/index/?id=${
        this.$yroute.query.id
      }&partake=${this.userInfo.uid}`
    };
--- a/pages/activity/GoodsBargain/index.vue
+++ b/pages/activity/GoodsBargain/index.vue
@ -69,7 +69,7 @@ export default {
    },
    goDetail: function(id) {
      this.$yrouter.push({
-        path: "/pages/activity/DargainDetails/main",
+        path: "/pages/activity/DargainDetails/index",
        query: { id, partake: 0 }
      });
    }
--- a/pages/activity/GoodsGroup/index.vue
+++ b/pages/activity/GoodsGroup/index.vue
@ -84,7 +84,7 @@ export default {
    },
    link: function(id) {
      this.$yrouter.push({
-        path: "/pages/activity/GroupDetails/main",
+        path: "/pages/activity/GroupDetails/index",
        query: { id }
      });
    }
--- a/pages/activity/GoodsSeckill/index.vue
+++ b/pages/activity/GoodsSeckill/index.vue
@ -115,7 +115,7 @@ export default {
  methods: {
    mountedStart: function() {
      var that = this;
-      wx.showLoading();
+      uni.showLoading();
      getSeckillConfig().then(res => {
        that.$set(that, "headerImg", res.data.lovely);
        that.$set(that, "timeList", res.data.seckillTime);
@ -161,7 +161,7 @@ export default {
        that.getSeckillList();
        that.$nextTick(function() {
          that.sticky = true;
-          wx.hideLoading();
+          uni.hideLoading();
        });
      });
    },
@ -180,14 +180,14 @@ export default {
        that.status = res.data.length < that.limit;
        that.seckillList.push.apply(that.seckillList, res.data);
        that.page++;
-        wx.hideLoading();
+        uni.hideLoading();
      });
    },
    goDetail: function(id) {
      var that = this;
      var time = that.timeList[that.active].stop;
      this.$yrouter.push({
-        path: "/pages/activity/SeckillDetails/main",
+        path: "/pages/activity/SeckillDetails/index",
        query: { id, time }
      });
    }
--- a/pages/activity/GroupDetails/index.vue
+++ b/pages/activity/GroupDetails/index.vue
@ -256,14 +256,14 @@ export default {
    groupRule: function(id) {
      var that = this;
      that.$yrouter.push({
-        path: "/pages/activity/GroupRule/main",
+        path: "/pages/activity/GroupRule/index",
        query: { id }
      });
    },
    goReply: function() {
      var that = this;
      that.$yrouter.push({
-        path: "/pages/shop/EvaluateList/main",
+        path: "/pages/shop/EvaluateList/index",
        query: { id: that.storeInfo.product_id }
      });
    },
@ -311,7 +311,7 @@ export default {
        postCartAdd(data)
          .then(res => {
            that.$yrouter.push({
-              path: "/pages/order/OrderSubmission/main",
+              path: "/pages/order/OrderSubmission/index",
              query: { id: res.data.cartId }
            });
          })
--- a/pages/activity/GroupRule/index.vue
+++ b/pages/activity/GroupRule/index.vue
@ -148,7 +148,7 @@ export default {
      postCartAdd(data)
        .then(res => {
          that.$yrouter.push({
-            path: "/pages/order/OrderSubmission/main",
+            path: "/pages/order/OrderSubmission/index",
            query: { id: res.data.cartId, pinkid: that.pinkId }
          });
        })
@ -159,27 +159,27 @@ export default {
    goPoster: function() {
      var that = this;
      this.$yrouter.push({
-        path: "/pages/activity/Poster/main",
+        path: "/pages/activity/Poster/index",
        query: { id: that.pinkId, type: 1 }
      });
    },
    goOrder: function() {
      var that = this;
      this.$yrouter.push({
-        path: "/pages/order/OrderDetails/main",
+        path: "/pages/order/OrderDetails/index",
        query: { id: that.currentPinkOrder }
      });
    },
    //拼团列表
    goList: function() {
      this.$yrouter.push({
-        path: "/pages/activity/GoodsGroup/main"
+        path: "/pages/activity/GoodsGroup/index"
      });
    },
    //拼团详情
    goDetail: function(id) {
      this.$yrouter.push({
-        path: "/pages/activity/GroupDetails/main",
+        path: "/pages/activity/GroupDetails/index",
        query: { id }
      });
    },
@ -202,14 +202,14 @@ export default {
      var that = this;
      getCombinationRemove({ id: that.pinkId, cid: that.storeCombination.id })
        .then(res => {
-          wx.showToast({
+          uni.showToast({
            title: res.msg,
            icon: "none",
            duration: 2000
          });
        })
        .catch(res => {
-          wx.showToast({
+          uni.showToast({
            title: res.msg,
            icon: "none",
            duration: 2000
--- a/pages/activity/Poster/index.vue
+++ b/pages/activity/Poster/index.vue
@ -48,7 +48,7 @@ export default {
          that.status = false;
        })
        .catch(res => {
-          wx.showToast({
+          uni.showToast({
            title: res.msg,
            icon: "none",
            duration: 2000
@ -64,7 +64,7 @@ export default {
          that.status = false;
        })
        .catch(res => {
-          wx.showToast({
+          uni.showToast({
            title: res.msg,
            icon: "none",
            duration: 2000
--- a/pages/activity/SeckillDetails/index.vue
+++ b/pages/activity/SeckillDetails/index.vue
@ -41,7 +41,7 @@
    <div class="footerRush acea-row row-between-wrapper">
      <div
        class="customerSer acea-row row-center-wrapper row-column"
-        @click="$yrouter.push({ path: '/pages/user/CustomerList/index' })"
+        @click="routerGo()"
      >
        <div class="iconfont icon-kefu"></div>
        <div>客服</div>
@ -123,6 +123,9 @@ export default {
    this.mountedStart();
  },
  methods: {
+    routerGo(item) {
+      this.$yrouter.push({ path: '/pages/user/CustomerList/index' })
+    },
    mountedStart: function() {
      var that = this;
      let id = that.$yroute.query.id;
@ -196,7 +199,7 @@ export default {
      if (that.attr.cartAttr == false) {
        that.attr.cartAttr = !this.attr.attrcartAttr;
      } else {
-        console.log(that.storeInfo)
+        console.log(that.storeInfo);
        var data = {};
        data.productId = that.storeInfo.productId;
        data.cartNum = that.attr.productSelect.cart_num;
@ -207,7 +210,7 @@ export default {
          .then(res => {
            console.log(res);
            that.$yrouter.push({
-              path: "/pages/order/OrderSubmission/main",
+              path: "/pages/order/OrderSubmission/index",
              query: { id: res.data.cartId }
            });
          })
--- a/pages/authorization/index.vue
+++ b/pages/authorization/index.vue
@ -46,18 +46,18 @@ export default {
      //   });
      // } else {
      //   this.$yrouter.replace({
-      //     path: "/pages/launch/main",
+      //     path: "/pages/launch/index",
      //     query: { type: 0 }
      //   });
      // }
      this.CHANGE_TABTAR(0);
      this.$yrouter.replace({
-        path: "/pages/launch/main",
+        path: "/pages/home/index",
        query: { type: 0 }
      });
    },
    getUserInfo(data) {
-      wx.showLoading({
+      uni.showLoading({
        title: "登录中"
      });
      login();
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@ -1,7 +1,7 @@
 <template>
  <div class="index">
    <div class="header acea-row row-center-wrapper">
-      <div @click="$yrouter.push('/pages/shop/GoodSearch/index')" class="search acea-row row-middle">
+      <div @click="goGoodSearch()" class="search acea-row row-middle">
        <span class="iconfont icon-xiazai5"></span>搜索商品
      </div>
    </div>
@ -17,7 +17,7 @@
      </swiper>
    </div>
    <div class="news acea-row row-between-wrapper">
-      <div class="pictrue">
+      <div class="pictrue" v-if="$VUE_APP_RESOURCES_URL">
        <img :src="$VUE_APP_RESOURCES_URL+'/images/news.png'" />
      </div>
      <div class="swiper-no-swiping new-banner">
@ -32,7 +32,7 @@
          <block v-for="(item, rollIndex) in roll" :key="rollIndex">
            <swiper-item class="swiper-slide">
              <div
-                @click="item.wxapp_url?$yrouter.push(item.wxapp_url) : ''"
+                @click="item.uniapp_url?$yrouter.push(item.uniapp_url) : ''"
                class="swiper-item acea-row row-between-wrapper"
              >
                <div class="text acea-row row-between-wrapper">
@ -48,7 +48,7 @@
    </div>
    <div class="nav acea-row">
      <div
-        @click="$yrouter.push(item.wxapp_url)"
+        @click="goWxappUrl(item)"
        class="item"
        v-for="(item, menusIndex) in menus"
        :key="menusIndex"
@ -65,10 +65,7 @@
        <div class="text">
          <div class="name line1">热门榜单</div>
        </div>
-        <div
-          @click="$yrouter.push({ path: '/pages/shop/HotNewGoods/index',query:{type:2} })"
-          class="more"
-        >
+        <div @click="goHotNewGoods()" class="more">
          更多
          <span class="iconfont icon-jiantou"></span>
        </div>
@ -77,7 +74,7 @@
        <scroll-view scroll-y="false" scroll-x="true">
          <div class="newProductsScroll">
            <div
-              @click="$yrouter.push({ path: '/pages/shop/GoodsCon/index',query:{id:item.id} })"
+              @click="goGoodsCon(item)"
              class="newProductsItem"
              v-for="(item, likeInfoIndex) in likeInfo"
              :key="likeInfoIndex"
@ -97,10 +94,7 @@
        <div class="text">
          <div class="name line1">精品推荐</div>
        </div>
-        <div
-          @click="$yrouter.push({ path: '/pages/shop/HotNewGoods/index',query:{type:1} })"
-          class="more"
-        >
+        <div @click="goHotNewGoods(1)" class="more">
          更多
          <span class="iconfont icon-jiantou"></span>
        </div>
@ -116,10 +110,7 @@
            <span class="new font-color-red">NEW~</span>
          </div>
        </div>
-        <div
-          @click="$yrouter.push({ path: '/pages/shop/HotNewGoods/index',query:{type:3} })"
-          class="more"
-        >
+        <div @click="goHotNewGoods(3)" class="more">
          更多
          <span class="iconfont icon-jiantou"></span>
        </div>
@ -128,7 +119,7 @@
        <scroll-view scroll-y="false" scroll-x="true">
          <div class="newProductsScroll">
            <div
-              @click="$yrouter.push({ path: '/pages/shop/GoodsCon/index',query:{id:item.id} })"
+              @click="goGoodsCon(item)"
              class="newProductsItem"
              v-for="(item, firstListIndex) in firstList"
              :key="firstListIndex"
@ -148,20 +139,19 @@
        <div class="text">
          <div class="name line1">促销单品</div>
        </div>
-        <div @click="$yrouter.push('/pages/shop/GoodsPromotion/index')" class="more">
+        <div @click="goGoodsPromotion()" class="more">
          更多
          <span class="iconfont icon-jiantou"></span>
        </div>
      </div>
    </div>
-    <Promotion-good :benefit="benefit"></Promotion-good>
+    <PromotionGood :benefit="benefit"></PromotionGood>
    <Coupon-window
      :coupon-list="couponList"
      v-if="showCoupon"
      @checked="couponClose"
      @close="couponClose"
    ></Coupon-window>
-    <div style="height:3rem;"></div>
  </div>
 </template>
 <script>
@ -283,6 +273,27 @@ export default {
    });
  },
  methods: {
+    goGoodSearch() {
+      this.$yrouter.push("/pages/shop/GoodSearch/index");
+    },
+    goWxappUrl(item) {
+      this.$yrouter.push(item.uniapp_url);
+    },
+    goHotNewGoods(type) {
+      this.$yrouter.push({
+        path: "/pages/shop/HotNewGoods/index",
+        query: { type }
+      });
+    },
+    goGoodsCon(item) {
+      this.$yrouter.push({
+        path: "/pages/shop/GoodsCon/index",
+        query: { id: item.id }
+      });
+    },
+    goGoodsPromotion() {
+      this.$yrouter.push("/pages/shop/GoodsPromotion/index");
+    },
    setOpenShare: function() {}
  }
 };
--- a/pages/order/GoodsReturn/index.vue
+++ b/pages/order/GoodsReturn/index.vue
@ -101,7 +101,7 @@ export default {
        refund_reason_wap_explain
      })
        .then(res => {
-          wx.showToast({
+          uni.showToast({
            title: res.msg,
            icon: "success",
            duration: 2000
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@ -48,9 +48,7 @@
          </div>
          <div class="font-color-red">{{ getStatus(order) }}</div>
        </div>
-        <div
-          @click="$yrouter.push({ path: '/pages/order/OrderDetails/index',query:{id:order.orderId} })"
-        >
+        <div @click="goOrderDetails(order)">
          <div
            class="item-info acea-row row-between row-top"
            v-for="(cart,cartInfoIndex) in order.cartInfo"
@ -118,13 +116,13 @@
            <div class="bnt cancelBnt" @click="cancelOrder(order)">取消订单</div>
            <div
              class="bnt bg-color-red"
-              @click="$yrouter.push({ path: '/pages/order/OrderDetails/index',query:{id:order.orderId} })"
+              @click="goOrderDetails(order)"
            >立即付款</div>
          </template>
          <template v-if="order._status._type == 1 || order._status._type == 9">
            <div
              class="bnt bg-color-red"
-              @click="$yrouter.push({ path: '/pages/order/OrderDetails/index',query:{id:order.orderId} })"
+              @click="goOrderDetails(order)"
            >查看详情</div>
          </template>
          <template v-if="order._status._type == 2">
@ -148,13 +146,13 @@
            <!--</div>-->
            <div
              class="bnt bg-color-red"
-              @click="$yrouter.push({ path: '/pages/order/OrderDetails/index',query:{id:order.orderId} })"
+              @click="goOrderDetails(order)"
            >去评价</div>
          </template>
          <template v-if="order._status._type === 4">
            <div
              class="bnt bg-color-red"
-              @click="$yrouter.push({ path: '/pages/order/OrderDetails/index',query:{id:order.orderId} })"
+              @click="goOrderDetails(order)"
            >查看订单</div>
          </template>
        </div>
@ -233,6 +231,12 @@ export default {
    type() {}
  },
  methods: {
+    goOrderDetails(order) {
+      this.$yrouter.push({
+        path: "/pages/order/OrderDetails/index",
+        query: { id: order.orderId }
+      });
+    },
    dataFormat,
    setOfflinePayStatus: function(status) {
      var that = this;
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@ -270,10 +270,7 @@
        <div class="bnt bg-color-red" @click="pay = true">立即付款</div>
      </template>
      <template v-if="status.type == 1">
-        <div
-          class="bnt cancel"
-          @click="$yrouter.push({ path: '/pages/order/GoodsReturn/index',query:{id:orderInfo.orderId } })"
-        >申请退款</div>
+        <div class="bnt cancel" @click="goGoodsReturn(orderInfo)">申请退款</div>
      </template>
      <template v-if="status.type == 2">
        <div
@ -302,12 +299,7 @@
        >查看物流</div>
      </template>
      <template v-if="status.type == 6">
-        <div
-          class="bnt bg-color-red"
-          @click="
-            $yrouter.push({ path: '/pages/activity/GroupRule/index',query:{id:orderInfo.pinkId} })
-          "
-        >查看拼团</div>
+        <div class="bnt bg-color-red" @click="goGroupRule(orderInfo)">查看拼团</div>
      </template>
    </div>
    <Payment v-model="pay" :types="payType" @checked="toPay" :balance="userInfo.nowMoney"></Payment>
@ -322,6 +314,24 @@
    </div>
  </div>
 </template>
+<script>
+export default {
+  methods: {
+    goGoodsReturn(orderInfo) {
+      this.$yrouter.push({
+        path: "/pages/order/GoodsReturn/index",
+        query: { id: orderInfo.orderId }
+      });
+    },
+    goGroupRule(orderInfo) {
+      this.$yrouter.push({
+        path: "/pages/activity/GroupRule/index",
+        query: { id: orderInfo.pinkId }
+      });
+    }
+  }
+};
+</script>
 <style scoped>
 .geoPage {
  position: fixed;
@ -612,7 +622,7 @@ export default {
          this.setOfflinePayStatus(this.orderInfo.offlinePayStatus);
        })
        .catch(err => {
-          wx.showToast({
+          uni.showToast({
            title: err.response.data.msg,
            icon: "none",
            duration: 2000
--- a/pages/order/OrderSubmission/index.vue
+++ b/pages/order/OrderSubmission/index.vue
@ -366,7 +366,7 @@ export default {
        const data = res.data;
        if (data.status === "EXTEND_ORDER") {
          this.$yrouter.replace({
-            path: "/pages/order/OrderDetails/main",
+            path: "/pages/order/OrderDetails/index",
            query: { id: data.result.orderId }
          });
        } else {
@ -442,7 +442,7 @@ export default {
        }
      }

-      wx.showLoading({ title: "生成订单中" });
+      uni.showLoading({ title: "生成订单中" });
      createOrder(this.orderGroupInfo.orderKey, {
        realName: this.contacts,
        phone: this.contactsTel,
@ -459,7 +459,7 @@ export default {
        shippingType: parseInt(shipping_type) + 1
      })
        .then(res => {
-          wx.hideLoading();
+          uni.hideLoading();
          const data = res.data;
          switch (data.status) {
            case "ORDER_EXIST":
@ -468,24 +468,24 @@ export default {
            case "PAY_ERROR":
              this.$dialog.toast({ mes: res.msg });
              this.$yrouter.replace({
-                path: "/pages/order/OrderDetails/main",
+                path: "/pages/order/OrderDetails/index",
                query: { id: data.result.orderId }
              });
              break;
            case "SUCCESS":
-              wx.showToast({
+              uni.showToast({
                title: res.msg,
                icon: "none",
                duration: 2000
              });
              this.$yrouter.replace({
-                path: "/pages/order/OrderDetails/main",
+                path: "/pages/order/OrderDetails/index",
                query: { id: data.result.orderId }
              });
              break;
            case "WECHAT_H5_PAY":
              this.$yrouter.replace({
-                path: "/pages/order/OrderDetails/main",
+                path: "/pages/order/OrderDetails/index",
                query: { id: data.result.orderId }
              });
              setTimeout(() => {
@ -495,7 +495,7 @@ export default {
            case "WECHAT_PAY":
              weappPay(data.result.jsConfig).then(res => {
                this.$yrouter.replace({
-                  path: "/pages/order/OrderDetails/main",
+                  path: "/pages/order/OrderDetails/index",
                  query: { id: data.result.orderId }
                });
              });
@ -503,13 +503,13 @@ export default {
            // 下面为原先微信支付方式，
            // pay(data.result.jsConfig).finally(() => {
            //   this.$yrouter.replace({
-            //     path: "/pages/order/OrderDetails/main" ,query: { id: data.result.orderId}
+            //     path: "/pages/order/OrderDetails/index" ,query: { id: data.result.orderId}
            //   });
            // });
          }
        })
        .catch(err => {
-          wx.hideLoading();
+          uni.hideLoading();
          this.$dialog.error(err.response.data.msg || "创建订单失败");
        });
    }
--- a/pages/order/ReturnList/index.vue
+++ b/pages/order/ReturnList/index.vue
@ -8,16 +8,10 @@
        class="item acea-row row-between-wrapper"
        v-for="(cart,cartInfoIndex) in order.cartInfo"
        :key="cartInfoIndex"
-        @click="$yrouter.push({ path: '/pages/order/OrderDetails/index',query:{id:order.orderId} })"
+        @click="goOrderDetails(order)"
      >
        <div class="pictrue">
-          <img
-            :src="cart.productInfo.image"
-            class="image"
-            @click.stop="
-              $yrouter.push({ path: '/pages/shop/GoodsCon/index',query: { id: cart.productInfo.id } })
-            "
-          />
+          <img :src="cart.productInfo.image" class="image" @click.stop="goGoodsCon(cart)" />
        </div>
        <div class="text">
          <div class="acea-row row-between-wrapper">
@ -67,6 +61,18 @@ export default {
    };
  },
  methods: {
+    goGoodsCon(cart) {
+      this.$yrouter.push({
+        path: "/pages/shop/GoodsCon/index",
+        query: { id: cart.productInfo.id }
+      });
+    },
+    goOrderDetails(order) {
+      this.$yrouter.push({
+        path: "/pages/order/OrderDetails/index",
+        query: { id: order.orderId }
+      });
+    },
    getOrderList() {
      const { page, limit } = this;
      if (this.loading || this.loaded) return;
@ -88,6 +94,6 @@ export default {
  },
  onReachBottom() {
    !this.loading && this.getOrderList();
-  },
+  }
 };
 </script>
--- a/pages/orderAdmin/AdminOrder/index.vue
+++ b/pages/orderAdmin/AdminOrder/index.vue
@ -134,11 +134,7 @@
        v-if="orderInfo.pay_type === 'offline' && orderInfo.paid === 0"
        @click="offlinePay"
      >确认付款</div>
-      <div
-        class="bnt delivery"
-        v-if="types == 1"
-        @click="$yrouter.push({path:'/pages/orderAdmin/GoodsDeliver/index',query: { id : orderInfo.orderId}})"
-      >去发货</div>
+      <div class="bnt delivery" v-if="types == 1" @click="goGoodsDeliver(orderInfo)">去发货</div>
    </div>
    <PriceChange
      :change="change"
@ -198,6 +194,12 @@ export default {
    this.getIndex();
  },
  methods: {
+    goGoodsDeliver(orderInfo) {
+      this.$yrouter.push({
+        path: "/pages/orderAdmin/GoodsDeliver/index",
+        query: { id: orderInfo.orderId }
+      });
+    },
    copyClipboard,
    more: function() {
      this.order = !this.order;
@ -219,7 +221,7 @@ export default {
          that.payType = res.data._status._payType;
        },
        err => {
-          wx.showToast({
+          uni.showToast({
            title: res.msg,
            icon: "none",
            duration: 2000
@ -249,7 +251,7 @@ export default {
        setAdminOrderPrice(data).then(
          function() {
            that.change = false;
-            wx.showToast({
+            uni.showToast({
              title: "改价成功",
              icon: "success",
              duration: 2000
@ -258,7 +260,7 @@ export default {
          },
          function() {
            that.change = false;
-            wx.showToast({
+            uni.showToast({
              title: "改价失败",
              icon: "none",
              duration: 2000
@ -281,7 +283,7 @@ export default {
        setOrderRefund(data).then(
          res => {
            that.change = false;
-            wx.showToast({
+            uni.showToast({
              title: res.msg,
              icon: "none",
              duration: 2000
@ -290,7 +292,7 @@ export default {
          },
          err => {
            that.change = false;
-            wx.showToast({
+            uni.showToast({
              title: res.msg,
              icon: "none",
              duration: 2000
@ -310,7 +312,7 @@ export default {
        setAdminOrderRemark(data).then(
          res => {
            that.change = false;
-            wx.showToast({
+            uni.showToast({
              title: res.msg,
              icon: "none",
              duration: 2000
@ -319,7 +321,7 @@ export default {
          },
          err => {
            that.change = false;
-            wx.showToast({
+            uni.showToast({
              title: res.msg,
              icon: "none",
              duration: 2000
@ -331,7 +333,7 @@ export default {
    offlinePay: function() {
      setOfflinePay({ order_id: this.orderInfo.order_id }).then(
        res => {
-          wx.showToast({
+          uni.showToast({
            title: res.msg,
            icon: "none",
            duration: 2000
@ -339,7 +341,7 @@ export default {
          this.getIndex();
        },
        err => {
-          wx.showToast({
+          uni.showToast({
            title: err.msg,
            icon: "none",
            duration: 2000
--- a/pages/orderAdmin/AdminOrderList/index.vue
+++ b/pages/orderAdmin/AdminOrderList/index.vue
@ -65,11 +65,7 @@
              v-if="item.pay_type === 'offline' && item.paid === 0"
              @click="offlinePay(item)"
            >确认付款</div>
-            <div
-              class="bnt"
-              v-if="where.status == 1"
-              @click="$yrouter.push({path:'/pages/orderAdmin/GoodsDeliver/index',query: { id:item.orderId }})"
-            >去发货</div>
+            <div class="bnt" v-if="where.status == 1" @click="goGoodsDeliver(item)">去发货</div>
          </div>
        </div>
      </div>
@ -144,6 +140,12 @@ export default {
    !that.loading && that.getIndex();
  },
  methods: {
+    goGoodsDeliver(item) {
+      this.$yrouter.push({
+        path: "/pages/orderAdmin/GoodsDeliver/index",
+        query: { id: item.orderId }
+      });
+    },
    more: function(index) {
      if (this.current === index) this.current = "";
      else this.current = index;
@ -179,7 +181,7 @@ export default {
        setAdminOrderPrice(data).then(
          function() {
            that.change = false;
-            wx.showToast({
+            uni.showToast({
              title: "改价成功",
              icon: "success",
              duration: 2000
@ -188,7 +190,7 @@ export default {
          },
          function() {
            that.change = false;
-            wx.showToast({
+            uni.showToast({
              title: "改价失败",
              icon: "none",
              duration: 2000
@ -211,7 +213,7 @@ export default {
        setOrderRefund(data).then(
          res => {
            that.change = false;
-            wx.showToast({
+            uni.showToast({
              title: res.msg,
              icon: "none",
              duration: 2000
@ -220,7 +222,7 @@ export default {
          },
          err => {
            that.change = false;
-            wx.showToast({
+            uni.showToast({
              title: res.msg,
              icon: "none",
              duration: 2000
@ -239,7 +241,7 @@ export default {
        setAdminOrderRemark(data).then(
          res => {
            that.change = false;
-            wx.showToast({
+            uni.showToast({
              title: res.msg,
              icon: "none",
              duration: 2000
@ -248,7 +250,7 @@ export default {
          },
          err => {
            that.change = false;
-            wx.showToast({
+            uni.showToast({
              title: res.msg,
              icon: "none",
              duration: 2000
@ -277,7 +279,7 @@ export default {
          that.where.page = that.where.page + 1;
        },
        err => {
-          wx.showToast({
+          uni.showToast({
            title: res.msg,
            icon: "none",
            duration: 2000
@ -293,14 +295,14 @@ export default {
    },
    toDetail: function(item) {
      this.$yrouter.push({
-        path: "/pages/orderAdmin/AdminOrder/main",
+        path: "/pages/orderAdmin/AdminOrder/index",
        query: { oid: item.orderId }
      });
    },
    offlinePay: function(item) {
      setOfflinePay({ order_id: item.order_id }).then(
        res => {
-          this.$wx.showToast({ title: res.msg, icon: "none", duration: 2000 });
+          this.$uni.showToast({ title: res.msg, icon: "none", duration: 2000 });
          this.init();
        },
        error => {
--- a/pages/orderAdmin/GoodsDeliver/index.vue
+++ b/pages/orderAdmin/GoodsDeliver/index.vue
@ -121,7 +121,7 @@ export default {
          that.delivery = res.data;
        },
        error => {
-          wx.showToast({
+          uni.showToast({
            title: error.msg,
            icon: "none",
            duration: 2000
@ -136,7 +136,7 @@ export default {
          that.logistics = res.data;
        },
        error => {
-          wx.showToast({
+          uni.showToast({
            title: error.msg,
            icon: "none",
            duration: 2000
@ -185,7 +185,7 @@ export default {
      let that = this;
      setAdminOrderDelivery(item).then(
        res => {
-          wx.showToast({
+          uni.showToast({
            title: res.msg,
            icon: "none",
            duration: 2000
@ -193,7 +193,7 @@ export default {
          that.$yrouter.go(-1);
        },
        error => {
-          wx.showToast({
+          uni.showToast({
            title: error.msg,
            icon: "none",
            duration: 2000
--- a/pages/orderAdmin/OrderCancellation/index.vue
+++ b/pages/orderAdmin/OrderCancellation/index.vue
@ -94,7 +94,7 @@ export default {
        .then(res => {
          this.iShidden = true;
          this.verify_code = "";
-          this.$wx.showToast({                 title: res.msg, icon: 'none', duration: 2000               });
+          this.$uni.showToast({                 title: res.msg, icon: 'none', duration: 2000               });
        })
        .catch(res => {
          this.$dialog.error(res.msg);
@ -105,15 +105,15 @@ export default {
      if (!this.verify_code) return this.$dialog.error("请输入核销码");
      if (!ref.test(this.verify_code))
        return this.$dialog.error("请输入正确的核销码");
-      wx.showLoading({ title: "查询中" });
+      uni.showLoading({ title: "查询中" });
      orderVerific(this.verify_code, 0)
        .then(res => {
-          wx.hideLoading();
+          uni.hideLoading();
          this.orderInfo = res.data;
          this.iShidden = false;
        })
        .catch(() => {
-          wx.hideLoading();
+          uni.hideLoading();
        });
    },
    openQRCode: function() {
@ -127,7 +127,7 @@ export default {
      //       that.verify_code = res.resultStr;
      //       that.storeCancellation();
      //     } else {
-      //        wx.showToast({
+      //        uni.showToast({
      //                     title: '没有扫描到什么！',
      //                     icon: "none",
      //                     duration: 2000
@ -145,7 +145,7 @@ export default {
      //         },
      //         fail: function(res) {
      //           if (res.errMsg == "scanQRCode:permission denied") {
-      //              wx.showToast({
+      //              uni.showToast({
      //                     title: '没有权限',
      //                     icon: "none",
      //                     duration: 2000
--- a/pages/orderAdmin/OrderIndex/index.vue
+++ b/pages/orderAdmin/OrderIndex/index.vue
@ -1,38 +1,23 @@
 <template>
  <div class="order-index" ref="container">
    <div class="header acea-row">
-      <div
-        class="item"
-        @click="$yrouter.push({path:'/pages/orderAdmin/AdminOrderList/index',query:{types:0}})"
-      >
+      <div class="item" @click="goAdminOrderList(0)">
        <div class="num">{{ census.orderCount.unpaidCount }}</div>
        <div>待付款</div>
      </div>
-      <div
-        class="item"
-        @click="$yrouter.push({path:'/pages/orderAdmin/AdminOrderList/index',query:{types:1}})"
-      >
+      <div class="item" @click="goAdminOrderList(1)">
        <div class="num">{{ census.orderCount.unshippedCount }}</div>
        <div>待发货</div>
      </div>
-      <div
-        class="item"
-        @click="$yrouter.push({path:'/pages/orderAdmin/AdminOrderList/index',query:{types:2}})"
-      >
+      <div class="item" @click="goAdminOrderList(2)">
        <div class="num">{{ census.orderCount.receivedCount }}</div>
        <div>待收货</div>
      </div>
-      <div
-        class="item"
-        @click="$yrouter.push({path:'/pages/orderAdmin/AdminOrderList/index',query:{types:3}})"
-      >
+      <div class="item" @click="goAdminOrderList(3)">
        <div class="num">{{ census.orderCount.evaluatedCount }}</div>
        <div>待评价</div>
      </div>
-      <div
-        class="item"
-        @click="$yrouter.push({path:'/pages/orderAdmin/AdminOrderList/index',query:{types:3}})"
-      >
+      <div class="item" @click="goAdminOrderList(3)">
        <div class="num">{{ census.orderCount.refundCount }}</div>
        <div>退款</div>
      </div>
@ -42,45 +27,27 @@
        <span class="iconfont icon-shujutongji"></span>数据统计
      </div>
      <div class="list acea-row">
-        <div
-          class="item"
-          @click="$yrouter.push({path:'/pages/orderAdmin/Statistics/index',query:{type:'price',time:'today'}})"
-        >
+        <div class="item" @click="goStatistics({type:'price',time:'today'})">
          <div class="num">{{ census.orderTimeCount.todayPrice }}</div>
          <div>今日成交额</div>
        </div>
-        <div
-          class="item"
-          @click="$yrouter.push({path:'/pages/orderAdmin/Statistics/index',query:{type:'price',time:'yesterday'}})"
-        >
+        <div class="item" @click="goStatistics({type:'price',time:'yesterday'})">
          <div class="num">{{ census.orderTimeCount.proPrice }}</div>
          <div>昨日成交额</div>
        </div>
-        <div
-          class="item"
-          @click="$yrouter.push({path:'/pages/orderAdmin/Statistics/index',query:{type:'price',time:'month'}})"
-        >
+        <div class="item" @click="goStatistics({type:'price',time:'month'})">
          <div class="num">{{ census.orderTimeCount.monthPrice }}</div>
          <div>本月成交额</div>
        </div>
-        <div
-          class="item"
-          @click="$yrouter.push({path:'/pages/orderAdmin/Statistics/index',query:{type:'order',time:'today'}})"
-        >
+        <div class="item" @click="goStatistics({type:'order',time:'today'})">
          <div class="num">{{ census.orderTimeCount.todayCount }}</div>
          <div>今日订单数</div>
        </div>
-        <div
-          class="item"
-          @click="$yrouter.push({path:'/pages/orderAdmin/Statistics/index',query:{type:'order',time:'yesterday'}})"
-        >
+        <div class="item" @click="goStatistics({type:'order',time:'yesterday'})">
          <div class="num">{{ census.orderTimeCount.proCount }}</div>
          <div>昨日订单数</div>
        </div>
-        <div
-          class="item"
-          @click="$yrouter.push({path:'/pages/orderAdmin/Statistics/index',query:{type:'order',time:'month'}})"
-        >
+        <div class="item" @click="goStatistics({type:'order',time:'month'})">
          <div class="num">{{ census.orderTimeCount.monthCount }}</div>
          <div>本月订单数</div>
        </div>
@ -142,6 +109,18 @@ export default {
    !this.loading && this.getList();
  },
  methods: {
+    goStatistics(query) {
+      this.$yrouter.push({
+        path: "/pages/orderAdmin/Statistics/index",
+        query
+      });
+    },
+    goAdminOrderList(types) {
+      this.$yrouter.push({
+        path: "/pages/orderAdmin/AdminOrderList/index",
+        query: { types }
+      });
+    },
    getIndex: function() {
      var that = this;
      getStatisticsInfo().then(
--- a/pages/orderAdmin/Statistics/index.vue
+++ b/pages/orderAdmin/Statistics/index.vue
@ -238,7 +238,7 @@ export default {
          that.time_price = res.data.time;
        },
        error => {
-           wx.showToast({
+           uni.showToast({
                          title: error.msg,
                          icon: "none",
                          duration: 2000
--- a/pages/shop/GoodSearch/index.vue
+++ b/pages/shop/GoodSearch/index.vue
@ -59,7 +59,7 @@ export default {
      this.toSearch(search);
    },
    toSearch(s) {
-      this.$yrouter.push({ path: "/pages/shop/GoodsList/main", query: { s } });
+      this.$yrouter.push({ path: "/pages/shop/GoodsList/index", query: { s } });
    },
    getData() {
      getSearchKeyword().then(res => {
--- a/pages/shop/GoodsClass/index.vue
+++ b/pages/shop/GoodsClass/index.vue
@ -32,7 +32,7 @@
              class="item acea-row row-column row-middle"
              v-for="(child, categoryIndex) in item.children"
              :key="categoryIndex"
-              @click="$yrouter.push({path: '/pages/shop/GoodsList/index',query: { id: child.id, title: child.cateName }})"
+              @click="goGoodsList(child)"
            >
              <div class="picture">
                <img :src="child.pic" />
@ -75,6 +75,12 @@ export default {
    this.loadCategoryData();
  },
  methods: {
+    goGoodsList(child) {
+      this.$yrouter.push({
+        path: "/pages/shop/GoodsList/index",
+        query: { id: child.id, title: child.cateName }
+      });
+    },
    activeCateId(n) {
      let index = 0;
      n = parseInt(n);
@ -101,7 +107,7 @@ export default {
      var val = trim(this.search);
      if (val) {
        this.$yrouter.push({
-          path: "/pages/shop/GoodsList/main",
+          path: "/pages/shop/GoodsList/index",
          query: { s: val }
        });
        setTimeout(() => (this.search = ""), 500);
@ -115,11 +121,10 @@ export default {
    // document.removeEventListener("scroll", this.onScroll, false);
  }
 };
-
 </script>

 <style >
 .productSort {
-    height:100%
+  height: 100%;
 }
 </style>
--- a/pages/shop/GoodsCollection/index.vue
+++ b/pages/shop/GoodsCollection/index.vue
@ -2,10 +2,10 @@
  <div ref="container">
    <div class="collectionGoods" v-if="collectProductList.length > 0">
      <div
-        @click="$yrouter.push({ path: '/pages/shop/GoodsCon/index',query:{id:item.pid} })"
        class="item acea-row row-between-wrapper"
        v-for="(item, collectProductListIndex) in collectProductList"
        :key="collectProductListIndex"
+        @click="goGoodsCon(item)"
      >
        <div class="pictrue">
          <img :src="item.image" />
@ -60,6 +60,12 @@ export default {
    !this.loading && this.get_user_collect_product();
  },
  methods: {
+    goGoodsCon(item) {
+      this.$yrouter.push({
+        path: "/pages/shop/GoodsCon/index",
+        query: { id: item.pid }
+      });
+    },
    get_user_collect_product: function() {
      let that = this;
      if (that.loading) return; //阻止下次请求（false可以进行请求）；
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@ -68,10 +68,7 @@
    <div class="userEvaluation" v-if="replyCount">
      <div class="title acea-row row-between-wrapper">
        <div>用户评价({{ replyCount }})</div>
-        <div
-          @click="$yrouter.push({ path: '/pages/shop/EvaluateList/index',query:{id}})"
-          class="praise"
-        >
+        <div @click="goEvaluateList(id)" class="praise">
          <span class="font-color-red">{{ replyChance }}%</span>好评率
          <span class="iconfont icon-jiantou"></span>
        </div>
@ -109,7 +106,7 @@
    </div>
    <div style="height:100rpx;"></div>
    <div class="footer acea-row row-between-wrapper">
-      <!--<div class="item" @click="$yrouter.push({ path: '/pages/user/CustomerList/index' })">-->
+      <!--<div class="item" @click="goCustomerList()">-->
      <!--<div class="iconfont icon-kefu"></div>-->
      <!--<div>客服</div>-->
      <!--</div>-->
@ -118,7 +115,7 @@
        <div>收藏</div>
      </div>
      <div
-        @click="$yrouter.push('/pages/shop/ShoppingCart/index')"
+        @click="goShoppingCart()"
        class="item animated"
        :class="animated === true ? 'bounceIn' : ''"
      >
@ -166,177 +163,7 @@
    </div>
  </div>
 </template>
-<style scoped>
-.geoPage {
-  position: fixed;
-  width: 100%;
-  height: 100%;
-  top: 0;
-  z-index: 10000;
-}
-.product-con .store-info {
-  margin-top: 0.2rem;
-  background-color: #fff;
-}
-.product-con .store-info .title {
-  padding: 0 0.3rem;
-  font-size: 0.28rem;
-  color: #282828;
-  height: 0.8rem;
-  line-height: 0.8rem;
-  border-bottom: 0.01rem solid #f5f5f5;
-}
-.product-con .store-info .info {
-  padding: 0 0.3rem;
-  height: 1.26rem;
-}
-.product-con .store-info .info .picTxt {
-  width: 6.15rem;
-}
-.product-con .store-info .info .picTxt .pictrue {
-  width: 0.76rem;
-  height: 0.76rem;
-}
-.product-con .store-info .info .picTxt .pictrue img {
-  width: 100%;
-  height: 100%;
-  border-radius: 0.06rem;
-}
-.product-con .store-info .info .picTxt .text {
-  width: 5.22rem;
-}
-.product-con .store-info .info .picTxt .text .name {
-  font-size: 0.3rem;
-  color: #282828;
-}
-.product-con .store-info .info .picTxt .text .address {
-  font-size: 0.24rem;
-  color: #666;
-  margin-top: 0.03rem;
-}
-.product-con .store-info .info .picTxt .text .address .iconfont {
-  color: #707070;
-  font-size: 0.18rem;
-  margin-left: 0.1rem;
-}
-.product-con .store-info .info .picTxt .text .address .addressTxt {
-  width: 4.8rem;
-}
-.product-con .store-info .info .iconfont {
-  font-size: 0.4rem;
-}
-.product-con .superior {
-  background-color: #fff;
-  margin-top: 0.2rem;
-}
-.product-con .superior .title {
-  height: 0.98rem;
-}
-.product-con .superior .title img {
-  width: 0.3rem;
-  height: 0.3rem;
-}
-.product-con .superior .title .titleTxt {
-  margin: 0 0.2rem;
-  font-size: 0.3rem;
-  background-image: linear-gradient(to right, #f57a37 0%, #f21b07 100%);
-  background-image: -webkit-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
-  background-image: -moz-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
-  -webkit-background-clip: text;
-  -webkit-text-fill-color: transparent;
-}
-.product-con .superior .slider-banner {
-  width: 6.9rem;
-  margin: 0 auto;
-  padding-bottom: 0.2rem;
-}
-.product-con .superior .slider-banner .list {
-  width: 100%;
-  padding-bottom: 0.2rem;
-}
-.product-con .superior .slider-banner .list .item {
-  width: 2.15rem;
-  margin: 0 0.22rem 0.3rem 0;
-  font-size: 0.26rem;
-}
-.product-con .superior .slider-banner .list .item:nth-of-type(3n) {
-  margin-right: 0;
-}
-.product-con .superior .slider-banner .list .item .pictrue {
-  width: 100%;
-  height: 2.15rem;
-}
-.product-con .superior .slider-banner .list .item .pictrue img {
-  width: 100%;
-  height: 100%;
-  border-radius: 0.06rem;
-}
-.product-con .superior .slider-banner .list .item .name {
-  color: #282828;
-  margin-top: 0.12rem;
-}
-.product-con .superior .slider-banner .swiper-pagination-bullet {
-  background-color: #999;
-}
-.product-con .superior .slider-banner .swiper-pagination-bullet-active {
-  background-color: #e93323;
-}

-.mask {
-  -webkit-filter: blur(2px);
-  -moz-filter: blur(2px);
-  -ms-filter: blur(2px);
-  filter: blur(2px);
-}
-.footer .icon-shoucang1 {
-  color: #73cbb6;
-}
-.product-con .product-intro .conter div {
-  width: 100% !important;
-}
-.generate-posters {
-  width: 100%;
-  height: 1.7rem;
-  background-color: #fff;
-  position: fixed;
-  left: 0;
-  bottom: 0;
-  z-index: 99;
-  transform: translate3d(0, 100%, 0);
-  -webkit-transform: translate3d(0, 100%, 0);
-  -ms-transform: translate3d(0, 100%, 0);
-  -moz-transform: translate3d(0, 100%, 0);
-  -o-transform: translate3d(0, 100%, 0);
-  transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-  -webkit-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-  -moz-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-  -o-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-}
-.generate-posters.on {
-  transform: translate3d(0, 0, 0);
-  -webkit-transform: translate3d(0, 0, 0);
-  -ms-transform: translate3d(0, 0, 0);
-  -moz-transform: translate3d(0, 0, 0);
-  -o-transform: translate3d(0, 0, 0);
-}
-.generate-posters .item {
-  flex: 50%;
-  -webkit-flex: 50%;
-  -ms-flex: 50%;
-  text-align: center;
-}
-.generate-posters .item .iconfont {
-  font-size: 0.8rem;
-  color: #5eae72;
-}
-.generate-posters .item .iconfont.icon-haibao {
-  color: #5391f1;
-}
-.noscroll {
-  height: 100%;
-  overflow: hidden;
-}
-</style>
 <script>
 // import { swiper, swiperSlide } from "vue-awesome-swiper";

@ -441,6 +268,18 @@ export default {
    this.productCon();
  },
  methods: {
+    goShoppingCart() {
+      this.$yrouter.switchTab("/pages/shop/ShoppingCart/index");
+    },
+    goCustomerList() {
+      this.$yrouter.push({ path: "/pages/user/CustomerList/index" });
+    },
+    goEvaluateList(id) {
+      this.$yrouter.push({
+        path: "/pages/shop/EvaluateList/index",
+        query: { id }
+      });
+    },
    showChang: function() {
      if (isWeixin()) {
        let config = {
@ -520,7 +359,7 @@ export default {
          that.getCartCount();
        })
        .catch(res => {
-          wx.showToast({
+          uni.showToast({
            title: res.msg,
            icon: "none",
            duration: 2000
@ -744,7 +583,7 @@ export default {
          that.attr.cartAttr = false;
          if (news) {
            that.$yrouter.push({
-              path: "/pages/order/OrderSubmission/main",
+              path: "/pages/order/OrderSubmission/index",
              query: { id: res.data.cartId }
            });
          } else {
@ -758,7 +597,7 @@ export default {
        })
        .catch(error => {
          that.isOpen = false;
-          wx.showToast({
+          uni.showToast({
            title: error.response.data.msg,
            icon: "none",
            duration: 2000
@ -799,3 +638,176 @@ export default {
  }
 };
 </script>
+
+
+<style scoped>
+.geoPage {
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  z-index: 10000;
+}
+.product-con .store-info {
+  margin-top: 0.2rem;
+  background-color: #fff;
+}
+.product-con .store-info .title {
+  padding: 0 0.3rem;
+  font-size: 0.28rem;
+  color: #282828;
+  height: 0.8rem;
+  line-height: 0.8rem;
+  border-bottom: 0.01rem solid #f5f5f5;
+}
+.product-con .store-info .info {
+  padding: 0 0.3rem;
+  height: 1.26rem;
+}
+.product-con .store-info .info .picTxt {
+  width: 6.15rem;
+}
+.product-con .store-info .info .picTxt .pictrue {
+  width: 0.76rem;
+  height: 0.76rem;
+}
+.product-con .store-info .info .picTxt .pictrue img {
+  width: 100%;
+  height: 100%;
+  border-radius: 0.06rem;
+}
+.product-con .store-info .info .picTxt .text {
+  width: 5.22rem;
+}
+.product-con .store-info .info .picTxt .text .name {
+  font-size: 0.3rem;
+  color: #282828;
+}
+.product-con .store-info .info .picTxt .text .address {
+  font-size: 0.24rem;
+  color: #666;
+  margin-top: 0.03rem;
+}
+.product-con .store-info .info .picTxt .text .address .iconfont {
+  color: #707070;
+  font-size: 0.18rem;
+  margin-left: 0.1rem;
+}
+.product-con .store-info .info .picTxt .text .address .addressTxt {
+  width: 4.8rem;
+}
+.product-con .store-info .info .iconfont {
+  font-size: 0.4rem;
+}
+.product-con .superior {
+  background-color: #fff;
+  margin-top: 0.2rem;
+}
+.product-con .superior .title {
+  height: 0.98rem;
+}
+.product-con .superior .title img {
+  width: 0.3rem;
+  height: 0.3rem;
+}
+.product-con .superior .title .titleTxt {
+  margin: 0 0.2rem;
+  font-size: 0.3rem;
+  background-image: linear-gradient(to right, #f57a37 0%, #f21b07 100%);
+  background-image: -webkit-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
+  background-image: -moz-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
+.product-con .superior .slider-banner {
+  width: 6.9rem;
+  margin: 0 auto;
+  padding-bottom: 0.2rem;
+}
+.product-con .superior .slider-banner .list {
+  width: 100%;
+  padding-bottom: 0.2rem;
+}
+.product-con .superior .slider-banner .list .item {
+  width: 2.15rem;
+  margin: 0 0.22rem 0.3rem 0;
+  font-size: 0.26rem;
+}
+.product-con .superior .slider-banner .list .item:nth-of-type(3n) {
+  margin-right: 0;
+}
+.product-con .superior .slider-banner .list .item .pictrue {
+  width: 100%;
+  height: 2.15rem;
+}
+.product-con .superior .slider-banner .list .item .pictrue img {
+  width: 100%;
+  height: 100%;
+  border-radius: 0.06rem;
+}
+.product-con .superior .slider-banner .list .item .name {
+  color: #282828;
+  margin-top: 0.12rem;
+}
+.product-con .superior .slider-banner .swiper-pagination-bullet {
+  background-color: #999;
+}
+.product-con .superior .slider-banner .swiper-pagination-bullet-active {
+  background-color: #e93323;
+}
+
+.mask {
+  -webkit-filter: blur(2px);
+  -moz-filter: blur(2px);
+  -ms-filter: blur(2px);
+  filter: blur(2px);
+}
+.footer .icon-shoucang1 {
+  color: #73cbb6;
+}
+.product-con .product-intro .conter div {
+  width: 100% !important;
+}
+.generate-posters {
+  width: 100%;
+  height: 1.7rem;
+  background-color: #fff;
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  z-index: 99;
+  transform: translate3d(0, 100%, 0);
+  -webkit-transform: translate3d(0, 100%, 0);
+  -ms-transform: translate3d(0, 100%, 0);
+  -moz-transform: translate3d(0, 100%, 0);
+  -o-transform: translate3d(0, 100%, 0);
+  transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+  -webkit-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+  -moz-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+  -o-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+}
+.generate-posters.on {
+  transform: translate3d(0, 0, 0);
+  -webkit-transform: translate3d(0, 0, 0);
+  -ms-transform: translate3d(0, 0, 0);
+  -moz-transform: translate3d(0, 0, 0);
+  -o-transform: translate3d(0, 0, 0);
+}
+.generate-posters .item {
+  flex: 50%;
+  -webkit-flex: 50%;
+  -ms-flex: 50%;
+  text-align: center;
+}
+.generate-posters .item .iconfont {
+  font-size: 0.8rem;
+  color: #5eae72;
+}
+.generate-posters .item .iconfont.icon-haibao {
+  color: #5391f1;
+}
+.noscroll {
+  height: 100%;
+  overflow: hidden;
+}
+</style>
--- a/pages/shop/GoodsEvaluate/index.vue
+++ b/pages/shop/GoodsEvaluate/index.vue
@ -187,13 +187,13 @@ export default {
        comment: expect
      })
        .then(() => {
-          wx.showToast({
+          uni.showToast({
            title: "评价成功",
            icon: "success",
            duration: 2000
          });
          this.$yrouter.push({
-            path: "/pages/order/OrderDetails/main",
+            path: "/pages/order/OrderDetails/index",
            query: { id: this.orderCon.orderId }
          });
        })
--- a/pages/shop/GoodsList/index.vue
+++ b/pages/shop/GoodsList/index.vue
@ -40,7 +40,7 @@
      ref="container"
    >
      <div
-        @click="$yrouter.push({path: '/pages/shop/GoodsCon/index',query:{id:item.id}})"
+        @click="goGoodsCon(item)"
        class="item"
        :class="Switch === true ? '' : 'on'"
        v-for="(item, productListIndex) in productList"
@ -168,6 +168,12 @@ export default {
    this.nows = fals;
  },
  methods: {
+    goGoodsCon(item) {
+      this.$yrouter.push({
+        path: "/pages/shop/GoodsCon/index",
+        query: { id: item.id }
+      });
+    },
    updateTitle() {
      // document.title = this.title || this.$yroute.meta.title;
    },
@ -210,7 +216,7 @@ export default {
      let that = this;
      switch (index) {
        case 0:
-          return that.$yrouter.push({ path: "/pages/shop/GoodsClass/main" });
+          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;
--- a/pages/shop/ShoppingCart/index.vue
+++ b/pages/shop/ShoppingCart/index.vue
@ -39,10 +39,7 @@
            </div>
          </div>
          <div class="picTxt acea-row row-between-wrapper">
-            <div
-              class="pictrue"
-              @click="$yrouter.push({ path: '/pages/shop/GoodsCon/index',query:{id:item.productId }})"
-            >
+            <div class="pictrue" @click="goGoodsCon(item)">
              <img :src="item.productInfo.attrInfo.image" v-if="item.productInfo.attrInfo" />
              <img :src="item.productInfo.image" v-else />
            </div>
@ -101,7 +98,7 @@
        <div class="goodsList" :hidden="goodsHidden">
          <div v-for="(item, cartListinvalidIndex) in cartList.invalid" :key="cartListinvalidIndex">
            <div
-              @click="$yrouter.push({ path: '/pages/shop/GoodsCon/index',query:{id:item.productId }})"
+              @click="goGoodsCon(item)"
              class="item acea-row row-between-wrapper"
              v-if="item.productInfo"
            >
@ -134,7 +131,7 @@
    </div>
    <div style="height:2.1rem"></div>
    <div
-      :class="['footer acea-row row-between-wrapper',isIpx?'iphonex-footer':'']"
+      :class="['footer acea-row row-between-wrapper']"
      v-if="cartList.valid.length > 0"
    >
      <div>
@ -240,6 +237,12 @@ export default {
    });
  },
  methods: {
+    goGoodsCon(item) {
+      this.$yrouter.push({
+        path: "/pages/shop/GoodsCon/index",
+        query: { id: item.productId }
+      });
+    },
    getCartList: function() {
      let that = this;
      getCartList().then(res => {
@ -341,7 +344,7 @@ export default {
      }
      console.log(id);
      this.$yrouter.push({
-        path: "/pages/order/OrderSubmission/main",
+        path: "/pages/order/OrderSubmission/index",
        query: { id: id.join(",") }
      });
    },
@ -394,7 +397,7 @@ export default {
            this.getCartList();
          })
          .catch(error => {
-            wx.showToast({
+            uni.showToast({
              title: error.response.data.msg,
              icon: "none",
              duration: 2000
--- a/pages/shop/news/NewsList/index.vue
+++ b/pages/shop/news/NewsList/index.vue
@ -1,10 +1,7 @@
 <template>
  <div class="newsList" ref="container">
    <div class="list" v-for="(item, articleListIndex) in articleList" :key="articleListIndex">
-      <div
-        @click="$yrouter.push({ path: '/pages/shop/news/NewsDetail/index',query:{id:item.id }})"
-        class="item acea-row row-between-wrapper"
-      >
+      <div @click="goNewsDetail(item)" class="item acea-row row-between-wrapper">
        <div class="text acea-row row-column-between">
          <div class="name line2">{{ item.title }}</div>
          <div>{{ item.addTime }}</div>
@ -26,7 +23,6 @@
  </div>
 </template>
 <script>
-
 import { getArticleList } from "@/api/public";

 export default {
@ -73,6 +69,12 @@ export default {
    !this.loading && this.getArticleLists();
  },
  methods: {
+    goNewsDetail(item) {
+      this.$yrouter.push({
+        path: "/pages/shop/news/NewsDetail/index",
+        query: { id: item.id }
+      });
+    },
    getArticleLists: function() {
      let that = this;
      if (that.loading) return; //阻止下次请求（false可以进行请求）；
--- a/pages/user/BindingPhone/index.vue
+++ b/pages/user/BindingPhone/index.vue
@ -76,23 +76,23 @@ export default {
                      step: 1
                    })
                      .then(res => {
-                        wx.showToast({
+                        uni.showToast({
                          title: res.msg,
                          icon: "none",
                          duration: 2000
                        });
                        that.$yrouter.replace({
-                          path: "/pages/user/PersonalData/main"
+                          path: "/pages/user/PersonalData/index"
                        });
                      })
                      .catch(res => {
-                        wx.showToast({
+                        uni.showToast({
                          title: res.msg,
                          icon: "none",
                          duration: 2000
                        });
                        that.$yrouter.replace({
-                          path: "/pages/user/PersonalData/main"
+                          path: "/pages/user/PersonalData/index"
                        });
                      });
                  }
@ -101,29 +101,29 @@ export default {
                  txt: "取消",
                  color: false,
                  callback: () => {
-                    wx.showToast({
+                    uni.showToast({
                      title: "已取消绑定",
                      icon: "none",
                      duration: 2000
                    });
                    that.$yrouter.replace({
-                      path: "/pages/user/PersonalData/main"
+                      path: "/pages/user/PersonalData/index"
                    });
                  }
                }
              ]
            });
          } else {
-            wx.showToast({
+            uni.showToast({
              title: res.msg,
              icon: "none",
              duration: 2000
            });
-            that.$yrouter.replace({ path: "/pages/user/PersonalData/main" });
+            that.$yrouter.replace({ path: "/pages/user/PersonalData/index" });
          }
        })
        .catch(res => {
-          wx.showToast({
+          uni.showToast({
            title: res.msg,
            icon: "none",
            duration: 2000
@ -148,7 +148,7 @@ export default {

      registerVerify({ phone: phone })
        .then(res => {
-          wx.showToast({
+          uni.showToast({
            title: res.msg,
            icon: "none",
            duration: 2000
@ -156,7 +156,7 @@ export default {
          that.sendCode();
        })
        .catch(res => {
-          wx.showToast({
+          uni.showToast({
            title: res.msg,
            icon: "none",
            duration: 2000
--- a/pages/user/ChangePassword/index.vue
+++ b/pages/user/ChangePassword/index.vue
@ -84,7 +84,7 @@ export default {
      } catch (e) {
        return validatorDefaultCatch(e);
      }
-      if (password !== password2) return  wx.showToast({
+      if (password !== password2) return  uni.showToast({
                          title: '两次密码不一致',
                          icon: "none",
                          duration: 2000
@ -95,7 +95,7 @@ export default {
        password: that.password
      })
        .then(res => {
-          wx.showToast({
+          uni.showToast({
            title: res.msg,
            icon: "none",
            duration: 2000
@ -104,7 +104,7 @@ export default {
          // that.$yrouter.push({ path: "/pages/user/Login/index" });
        })
        .catch(res => {
-           wx.showToast({
+           uni.showToast({
                          title: res.msg,
                          icon: "none",
                          duration: 2000
@ -129,7 +129,7 @@ export default {

      registerVerify({ phone: yphone })
        .then(res => {
-          wx.showToast({
+          uni.showToast({
            title: res.msg,
            icon: "none",
            duration: 2000
@ -137,7 +137,7 @@ export default {
          that.sendCode();
        })
        .catch(res => {
-           wx.showToast({
+           uni.showToast({
                          title: res.msg,
                          icon: "none",
                          duration: 2000
--- a/pages/user/CustomerList/index.vue
+++ b/pages/user/CustomerList/index.vue
@ -4,7 +4,7 @@
      class="item acea-row row-between-wrapper"
      v-for="item in list"
      :key="item.id"
-      @click="$yrouter.push({path:'/pages/user/CustomerService/index',query:{id:item.uid}})"
+      @click="goCustomerService(item)"
    >
      <div class="pictrue">
        <img :src="item.avatar" />
@ -24,6 +24,12 @@ export default {
    };
  },
  methods: {
+    goCustomerService(item) {
+      this.$yrouter.push({
+        path: "/pages/user/CustomerService/index",
+        query: { id: item.uid }
+      });
+    },
    getList() {
      serviceList().then(res => {
        this.list = res.data;
--- a/pages/user/PersonalData/index.vue
+++ b/pages/user/PersonalData/index.vue
@ -76,41 +76,13 @@
          <input type="text" v-else value="未绑定" disabled class="id" />
        </div>
      </div>
-      <!--<div v-if="!userInfo.phone">-->
-      <!--<div-->
-      <!--@click="$yrouter.push('/pages/user/BindingPhone/index')"-->
-      <!--class="item acea-row row-between-wrapper"-->
-      <!--&gt;-->
-      <!--<div>绑定手机号</div>-->
-      <!--<div class="input">-->
-      <!--点击绑定手机号<span class="iconfont icon-xiangyou"></span>-->
-      <!--</div>-->
-      <!--</div>-->
-      <!--</div>-->
-      <!--<div class="item acea-row row-between-wrapper" v-else-if="userInfo.phone">-->
-      <!--<div>手机号码</div>-->
-      <!--<div class="input acea-row row-between-wrapper">-->
-      <!--<div class="input acea-row row-between-wrapper">-->
-      <!--<input-->
-      <!--type="text"-->
-      <!--:value="userInfo.phone"-->
-      <!--disabled-->
-      <!--class="id"-->
-      <!--/><span class="iconfont icon-suozi"></span>-->
-      <!--</div>-->
-      <!--</div>-->
-      <!--</div>-->
-      <!--<div v-if="userInfo.phone && userInfo.user_type === 'h5'">-->
-      <!--<div-->
-      <!--@click="$yrouter.push('/pages/user/ChangePassword/index')"-->
-      <!--class="item acea-row row-between-wrapper"-->
-      <!--&gt;-->
-      <!--<div>密码</div>-->
-      <!--<div class="input">-->
-      <!--点击修改密码<span class="iconfont icon-xiangyou"></span>-->
-      <!--</div>-->
-      <!--</div>-->
-      <!--</div>-->
+      <div class="item acea-row row-between-wrapper" @click="goChangePassword()">
+        <div>密码</div>
+        <div class="input acea-row row-between-wrapper">
+          <span>点击修改密码</span>
+          <span class="iconfont icon-suozi"></span>
+        </div>
+      </div>
    </div>
    <!--<div class="modifyBnt bg-color-red" @click="submit">保存修改</div>-->
    <!-- <div
@ -161,6 +133,9 @@ export default {
    this.getUserInfo();
  },
  methods: {
+    goChangePassword() {
+      this.$yrouter.push("/pages/user/ChangePassword/index");
+    },
    switchAccounts: function(index) {
      let that = this;
      this.userIndex = index;
@ -171,19 +146,19 @@ export default {
      if (userInfo.user_type === "h5") {
        switchH5Login()
          .then(({ data }) => {
-            wx.hideLoading();
+            uni.hideLoading();
            const expires_time = dayjs(data.expires_time);
            store.commit("LOGIN", data.token, expires_time);
            that.$emit("changeswitch", false);
            location.reload();
          })
          .catch(err => {
-            wx.hideLoading();
+            uni.hideLoading();
            return that.$dialog.toast({ mes: err });
          });
      } else {
        cookie.set("loginType", "wechat", 60);
-        wx.hideLoading();
+        uni.hideLoading();
        this.$store.commit("LOGOUT");
        this.$emit("changeswitch", false);
      }
@ -219,7 +194,7 @@ export default {
      }).then(
        res => {
          this.$store.dispatch("USERINFO", true);
-          this.$wx.showToast({ title: res.msg, icon: "none", duration: 2000 });
+          this.$uni.showToast({ title: res.msg, icon: "none", duration: 2000 });
          this.$yrouter.back();
        },
        error => {
--- a/pages/user/Register/index.vue
+++ b/pages/user/Register/index.vue
@ -11,7 +11,7 @@
        <div class="item">
          <div>
            <svg class="icon" aria-hidden="true">
-              <use xlink:href="#icon-phone_"></use>
+              <use xlink:href="#icon-phone_" />
            </svg>
            <input type="text" placeholder="输入手机号码" />
          </div>
@ -19,7 +19,7 @@
        <div class="item">
          <div class="align-left">
            <svg class="icon" aria-hidden="true">
-              <use xlink:href="#icon-code_1"></use>
+              <use xlink:href="#icon-code_1" />
            </svg>
            <input type="text" placeholder="填写验证码" class="codeIput" />
            <button
@ -27,15 +27,13 @@
              :disabled="disabled"
              :class="disabled === true ? 'on' : ''"
              @click="code"
-            >
-              {{ text }}
-            </button>
+            >{{ text }}</button>
          </div>
        </div>
        <div class="item">
          <div>
            <svg class="icon" aria-hidden="true">
-              <use xlink:href="#icon-code_"></use>
+              <use xlink:href="#icon-code_" />
            </svg>
            <input type="text" placeholder="填写您的登录密码" />
          </div>
@ -44,9 +42,7 @@
      <div class="logon">注册</div>
      <div class="tip">
        已有账号?
-        <span @click="$yrouter.push({ name: 'Login' })" class="font-color-red"
-          >立即登录</span
-        >
+        <span @click="goLogin()" class="font-color-red">立即登录</span>
      </div>
    </div>
    <div class="bottom"></div>
@ -62,6 +58,9 @@ export default {
  methods: {
    code: function() {
      this.sendCode();
+    },
+    goLogin() {
+      this.$yrouter.push({ path: "/pages/user/Login/index" });
    }
  }
 };
--- a/pages/user/RetrievePassword/index.vue
+++ b/pages/user/RetrievePassword/index.vue
@ -11,7 +11,7 @@
        <div class="item">
          <div>
            <svg class="icon" aria-hidden="true">
-              <use xlink:href="#icon-phone_"></use>
+              <use xlink:href="#icon-phone_" />
            </svg>
            <input type="text" placeholder="输入手机号码" v-model="account" />
          </div>
@ -19,42 +19,29 @@
        <div class="item">
          <div class="align-left">
            <svg class="icon" aria-hidden="true">
-              <use xlink:href="#icon-code_1"></use>
+              <use xlink:href="#icon-code_1" />
            </svg>
-            <input
-              type="text"
-              placeholder="填写验证码"
-              class="codeIput"
-              v-model="captcha"
-            />
+            <input type="text" placeholder="填写验证码" class="codeIput" v-model="captcha" />
            <button
              class="code"
              :disabled="disabled"
              :class="disabled === true ? 'on' : ''"
              @click="code"
-            >
-              {{ text }}
-            </button>
+            >{{ text }}</button>
          </div>
        </div>
        <div class="item">
          <div>
            <svg class="icon" aria-hidden="true">
-              <use xlink:href="#icon-code_"></use>
+              <use xlink:href="#icon-code_" />
            </svg>
-            <input
-              type="password"
-              placeholder="填写您的登录密码"
-              v-model="password"
-            />
+            <input type="password" placeholder="填写您的登录密码" v-model="password" />
          </div>
        </div>
      </div>
      <div class="logon" @click="registerReset">确认</div>
      <div class="tip">
-        <span @click="$yrouter.push({ name: 'Login' })" class="font-color-red"
-          >立即登录</span
-        >
+        <span @click="goLogin()" class="font-color-red">立即登录</span>
      </div>
    </div>
    <div class="bottom"></div>
@ -78,6 +65,9 @@ export default {
  },
  mixins: [sendVerifyCode],
  methods: {
+    goLogin() {
+      this.$yrouter.push({ path: "/pages/user/Login/index" });
+    },
    async registerReset() {
      var that = this;
      const { account, captcha, password } = that;
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@ -13,13 +13,8 @@
              {{ userInfo.vipName }}
            </div>
          </div>
-          <div
-            @click="$yrouter.push('/pages/user/PersonalData/index')"
-            class="id"
-            v-if="userInfo.phone"
-          >
-            ID：{{ userInfo.uid || 0
-            }}
+          <div @click="goPersonalData()" class="id" v-if="userInfo.phone">
+            ID：{{ userInfo.uid || 0}}
            <span class="iconfont icon-bianji1"></span>
          </div>
          <button
@ -32,30 +27,27 @@
          </button>
        </div>
      </div>
-      <span
-        class="iconfont icon-shezhi"
-        @click="$yrouter.push({ path: '/pages/user/PersonalData/index' })"
-      ></span>
+      <span class="iconfont icon-shezhi" @click="goPersonalData()"></span>
    </div>
    <div class="wrapper">
      <div class="nav acea-row row-middle">
-        <div @click="$yrouter.push({ path: '/pages/user/UserAccount/index' })" class="item">
+        <div @click="goUserAccount()" class="item">
          <div>我的余额</div>
          <div class="num">{{ userInfo.nowMoney || 0 }}</div>
        </div>
        <div
-          @click="$yrouter.push('/pages/user/promotion/UserPromotion/index')"
+          @click="goUserPromotion()"
          class="item"
          v-if="userInfo.isPromoter === 1 || userInfo.statu === 2"
        >
          <div>当前佣金</div>
          <div class="num">{{ userInfo.brokeragePrice || 0 }}</div>
        </div>
-        <div @click="$yrouter.push('/pages/user/signIn/Integral/index')" class="item" v-else>
+        <div @click="goIntegral()" class="item" v-else>
          <div>当前积分</div>
          <div class="num">{{ userInfo.integral || 0 }}</div>
        </div>
-        <div @click="$yrouter.push('/pages/user/coupon/UserCoupon/index')" class="item">
+        <div @click="goUserCoupon()" class="item">
          <div>优惠券</div>
          <div class="num">{{ userInfo.couponCount || 0 }}</div>
        </div>
@ -63,16 +55,13 @@
      <div class="myOrder">
        <div class="title acea-row row-between-wrapper">
          <div>我的订单</div>
-          <div @click="$yrouter.push('/pages/order/MyOrder/index')" class="allOrder">
+          <div @click="goMyOrder()" class="allOrder">
            全部订单
            <span class="iconfont icon-jiantou"></span>
          </div>
        </div>
        <div class="orderState acea-row row-middle">
-          <div
-            @click="$yrouter.push({ path: '/pages/order/MyOrder/index',query:{type:0}})"
-            class="item"
-          >
+          <div @click="goMyOrder(0)" class="item">
            <div class="pictrue">
              <img :src="$VUE_APP_RESOURCES_URL + '/images/dfk.png'" />
              <span
@ -82,10 +71,7 @@
            </div>
            <div>待付款</div>
          </div>
-          <div
-            @click="$yrouter.push({ path: '/pages/order/MyOrder/index',query:{type:1} })"
-            class="item"
-          >
+          <div @click="goMyOrder(1)" class="item">
            <div class="pictrue">
              <img :src="$VUE_APP_RESOURCES_URL+'/images/dfh.png'" />
              <span
@ -95,10 +81,7 @@
            </div>
            <div>待发货</div>
          </div>
-          <div
-            @click="$yrouter.push({ path: '/pages/order/MyOrder/index',query:{type:2}})"
-            class="item"
-          >
+          <div @click="goMyOrder(2)" class="item">
            <div class="pictrue">
              <img :src="$VUE_APP_RESOURCES_URL+'/images/dsh.png'" />
              <span
@ -108,10 +91,7 @@
            </div>
            <div>待收货</div>
          </div>
-          <div
-            @click="$yrouter.push({ path: '/pages/order/MyOrder/index',query:{type:3} })"
-            class="item"
-          >
+          <div @click="goMyOrder(3)" class="item">
            <div class="pictrue">
              <img :src="$VUE_APP_RESOURCES_URL+'/images/dpj.png'" />
              <span
@ -121,7 +101,7 @@
            </div>
            <div>待评价</div>
          </div>
-          <div @click="$yrouter.push('/pages/order/ReturnList/index')" class="item">
+          <div @click="goReturnList()" class="item">
            <div class="pictrue">
              <img :src="$VUE_APP_RESOURCES_URL+'/images/sh.png'" />
              <span
@ -194,16 +174,40 @@ export default {
    }
  },
  mounted: function() {
-    console.log('这个是个人中心')
+    console.log("这个是个人中心");
    this.User();
    this.MenuUser();
    this.isWeixin = isWeixin();
  },
  methods: {
+    goReturnList() {
+      this.$yrouter.push("/pages/order/ReturnList/index");
+    },
+    goMyOrder(type) {
+      this.$yrouter.push({
+        path: "/pages/order/MyOrder/index",
+        query: { type }
+      });
+    },
+    goUserCoupon() {
+      this.$yrouter.push("/pages/user/coupon/UserCoupon/index");
+    },
+    goIntegral() {
+      this.$yrouter.push("/pages/user/signIn/Integral/index");
+    },
+    goUserPromotion() {
+      this.$yrouter.push("/pages/user/promotion/UserPromotion/index");
+    },
+    goUserAccount() {
+      this.$yrouter.push({ path: "/pages/user/UserAccount/index" });
+    },
+    goPersonalData() {
+      this.$yrouter.push("/pages/user/PersonalData/index");
+    },
    getPhoneNumber: function(e) {
      console.log(e.mp.detail);
      if (e.mp.detail.errMsg == "getPhoneNumber:ok") {
-        wx.showLoading({ title: "绑定中" });
+        uni.showLoading({ title: "绑定中" });
        wx.login({
          success: loginRes => {
            bindingPhone({
@ -213,15 +217,15 @@ export default {
            })
              .then(res => {
                this.User();
-                wx.hideLoading();
-                wx.showToast({
+                uni.hideLoading();
+                uni.showToast({
                  title: res.msg,
                  icon: "success",
                  duration: 2000
                });
              })
              .catch(error => {
-                wx.showToast({
+                uni.showToast({
                  title: error.msg || error.response.data.msg,
                  icon: "none",
                  duration: 2000
@ -230,7 +234,7 @@ export default {
          }
        });
      } else {
-        wx.showToast({
+        uni.showToast({
          title: "已拒绝授权",
          icon: "none",
          duration: 2000
@ -254,9 +258,9 @@ export default {
      });
    },
    goPages: function(index) {
-      let url = this.MyMenus[index].wxapp_url;
+      let url = this.MyMenus[index].uniapp_url;
      if (
-        url === "/pages/user/promotion/UserPromotion/main" &&
+        url === "/pages/user/promotion/UserPromotion/index" &&
        this.userInfo.statu === 1
      ) {
        if (!this.userInfo.isPromoter)
@ -264,13 +268,13 @@ export default {
      }

      if (
-        url === "/pages/orderAdmin/OrderIndex/main" &&
+        url === "/pages/orderAdmin/OrderIndex/index" &&
        !this.userInfo.adminid
      ) {
        return this.$dialog.toast({ mes: "您还不是管理员！！" });
      }

-      this.$yrouter.push({ path: this.MyMenus[index].wxapp_url });
+      this.$yrouter.push({ path: this.MyMenus[index].uniapp_url });
    }
  },
  onShow() {
@ -282,7 +286,6 @@ export default {
 </script>

 <style>
-
 .footer-line-height {
  height: 1rem;
 }
--- a/pages/user/UserAccount/index.vue
+++ b/pages/user/UserAccount/index.vue
@ -18,13 +18,13 @@
        </div>
      </div>
      <div class="nav acea-row row-middle">
-        <div class="item" @click="$yrouter.push({path:'/pages/user/UserBill/index',query:{id:0}})">
+        <div class="item" @click="goUserBill(0)">
          <div class="pictrue">
            <img :src="$VUE_APP_RESOURCES_URL+'/images/record1.png'" />
          </div>
          <div>账单记录</div>
        </div>
-        <div class="item" @click="$yrouter.push({path:'/pages/user/UserBill/index',query:{id:1}})">
+        <div class="item" @click="goUserBill(1)">
          <div class="pictrue">
            <img :src="$VUE_APP_RESOURCES_URL+'/images/record2.png'" />
          </div>
@ -62,6 +62,9 @@ export default {
    this.getActivity();
  },
  methods: {
+    goUserBill(id) {
+      this.$yrouter.push({ path: "/pages/user/UserBill/index", query: { id } });
+    },
    getIndex: function() {
      let that = this;
      getBalance().then(
--- a/pages/user/address/AddressManagement/index.vue
+++ b/pages/user/address/AddressManagement/index.vue
@ -140,7 +140,7 @@ export default {
     */
    editAddress: function(index) {
      this.$yrouter.push({
-        path: "/pages/user/address/AddAddress/main",
+        path: "/pages/user/address/AddAddress/index",
        query: { id: this.addressList[index].id }
      });
    },
@ -167,7 +167,7 @@ export default {
    radioChange: function(id) {
      getAddressDefaultSet(id).then(res => {
        this.refresh();
-        wx.showToast({ title: res.msg, icon: "none", duration: 2000 });
+        uni.showToast({ title: res.msg, icon: "none", duration: 2000 });
      });
    },
    /**
@ -175,12 +175,12 @@ export default {
     */
    addAddress: function() {
      this.$yrouter.push({
-        path: "/pages/user/address/AddAddress/main"
+        path: "/pages/user/address/AddAddress/index"
      });
    },
    getAddress() {
      // openAddress().then(userInfo => {
-      //   wx.showLoading({ title: "加载中" });
+      //   uni.showLoading({ title: "加载中" });
      //   postAddress({
      //     real_name: userInfo.userName,
      //     phone: userInfo.telNumber,
@ -199,11 +199,11 @@ export default {
      //       this.loadend = false;
      //       this.addressList = [];
      //       this.AddressList();
-      //       wx.hideLoading();
+      //       uni.hideLoading();
      //       this.$dialog.toast({ mes: "添加成功" });
      //     })
      //     .catch(err => {
-      //       wx.hideLoading();
+      //       uni.hideLoading();
      //       this.$dialog.error(err.msg || "添加失败");
      //     });
      // });
--- a/pages/user/promotion/CashAudit/index.vue
+++ b/pages/user/promotion/CashAudit/index.vue
@ -1,14 +1,11 @@
 <template>
  <div class="cash-audit">
-    <div class="pictrue"><img :src="$VUE_APP_RESOURCES_URL+'/images/examine.png'" /></div>
+    <div class="pictrue">
+      <img :src="$VUE_APP_RESOURCES_URL+'/images/examine.png'" />
+    </div>
    <div class="tip">提现申请已提交，等待人工审核</div>
    <div class="time">{{ time }}</div>
-    <div
-      class="bnt bg-color-red"
-      @click="$yrouter.push({ path: '/pages/user/promotion/UserPromotion/index' })"
-    >
-      好的
-    </div>
+    <div class="bnt bg-color-red" @click="goUserPromotion()">好的</div>
  </div>
 </template>
 <script>
@ -25,6 +22,10 @@ export default {
    let myData = new Date();
    this.time = myData.toLocaleString();
  },
-  methods: {}
+  methods: {
+    goUserPromotion() {
+      this.$yrouter.push({ path: "/pages/user/promotion/UserPromotion/index" });
+    }
+  }
 };
 </script>
--- a/pages/user/promotion/Poster/index.vue
+++ b/pages/user/promotion/Poster/index.vue
@ -91,7 +91,7 @@ export default {
      var downloadUrl = imgsrc;

      if (!wx.saveImageToPhotosAlbum) {
-        wx.showModal({
+        uni.showModal({
          title: "提示",
          content:
            "当前微信版本过低，无法使用该功能，请升级到最新微信版本后重试。"
--- a/pages/user/promotion/UserPromotion/index.vue
+++ b/pages/user/promotion/UserPromotion/index.vue
@ -3,7 +3,7 @@
    <div class="header">
      <div class="name acea-row row-center-wrapper">
        <div>当前佣金</div>
-        <div class="record" @click="$yrouter.push('/pages/user/promotion/CashRecord/index')">
+        <div class="record" @click="goCashRecord()">
          提现记录
          <span class="iconfont icon-xiangyou"></span>
        </div>
@ -22,31 +22,19 @@
    </div>
    <div class="bnt bg-color-red" @click="toCash">立即提现</div>
    <div class="list acea-row row-between-wrapper">
-      <div
-        class="item acea-row row-center-wrapper row-column"
-        @click="$yrouter.push('/pages/user/promotion/Poster/index')"
-      >
+      <div class="item acea-row row-center-wrapper row-column" @click="goPoster()">
        <span class="iconfont icon-erweima"></span>
        <div>推广名片</div>
      </div>
-      <div
-        class="item acea-row row-center-wrapper row-column"
-        @click="$yrouter.push('/pages/user/promotion/PromoterList/index')"
-      >
+      <div class="item acea-row row-center-wrapper row-column" @click="goPromoterList()">
        <span class="iconfont icon-tongji"></span>
        <div>推广人统计</div>
      </div>
-      <div
-        class="item acea-row row-center-wrapper row-column"
-        @click="$yrouter.push('/pages/user/promotion/CommissionDetails/index')"
-      >
+      <div class="item acea-row row-center-wrapper row-column" @click="goCommissionDetails()">
        <span class="iconfont icon-qiandai"></span>
        <div>佣金明细</div>
      </div>
-      <div
-        class="item acea-row row-center-wrapper row-column"
-        @click="$yrouter.push('/pages/user/promotion/PromoterOrder/index')"
-      >
+      <div class="item acea-row row-center-wrapper row-column" @click="goPromoterOrder()">
        <span class="iconfont icon-dingdan"></span>
        <div>推广人订单</div>
      </div>
@ -73,6 +61,21 @@ export default {
    this.getInfo();
  },
  methods: {
+    goPoster() {
+      this.$yrouter.push("/pages/user/promotion/Poster/index");
+    },
+    goCashRecord() {
+      this.$yrouter.push("/pages/user/promotion/CashRecord/index");
+    },
+    goPromoterList() {
+      this.$yrouter.push("/pages/user/promotion/PromoterList/index");
+    },
+    goCommissionDetails() {
+      this.$yrouter.push("/pages/user/promotion/CommissionDetails/index");
+    },
+    goPromoterOrder() {
+      this.$yrouter.push("/pages/user/promotion/PromoterOrder/index");
+    },
    getInfo: function() {
      let that = this;
      getSpreadInfo().then(
@ -85,7 +88,7 @@ export default {
      );
    },
    toCash: function() {
-      this.$yrouter.push({ path: "/pages/user/promotion/UserCash/main" });
+      this.$yrouter.push({ path: "/pages/user/promotion/UserCash/index" });
    }
  }
 };
@ -93,5 +96,4 @@ export default {


 <style>
-
 </style>
--- a/pages/user/signIn/Integral/index.vue
+++ b/pages/user/signIn/Integral/index.vue
@ -28,7 +28,8 @@
          :key="navListIndex"
          @click="nav(navListIndex)"
        >
-          <span class="iconfont" :class="item.icon"></span>{{ item.name }}
+          <span class="iconfont" :class="item.icon"></span>
+          {{ item.name }}
        </div>
      </div>
      <div class="list" :hidden="current !== 0">
@ -43,23 +44,23 @@
        >
          <div>
            <div class="state">{{ item.title }}</div>
-            <div><data-format :data="item.addTime"></data-format></div>
+            <div>
+              <data-format :data="item.addTime"></data-format>
            </div>
-          <div class="num" v-if="item.pm == 1">+{{ item.number }}</div>
-          <div class="num font-color-red" v-if="item.pm == 0">
-            -{{ item.number }}
          </div>
+          <div class="num" v-if="item.pm == 1">+{{ item.number }}</div>
+          <div class="num font-color-red" v-if="item.pm == 0">-{{ item.number }}</div>
        </div>
      </div>
      <!--<div class="list2" :hidden="current !== 1">-->
-        <!--<div class="item acea-row row-between-wrapper" @click="$yrouter.switchTab('/pages/home/index')">-->
+      <!--<div class="item acea-row row-between-wrapper" @click="goHome()">-->
      <!--<div class="pictrue"><img :src="$VUE_APP_RESOURCES_URL+'/images/score.png'" /></div>-->
      <!--<div class="name">购买商品可获得积分奖励</div>-->
      <!--<div class="earn">赚积分</div>-->
      <!--</div>-->
      <!--<div-->
      <!--class="item acea-row row-between-wrapper"-->
-          <!--@click="$yrouter.push('/pages/user/signIn/Sign/index')"-->
+      <!--@click="goSignIn()"-->
      <!--&gt;-->
      <!--<div class="pictrue"><img :src="$VUE_APP_RESOURCES_URL+'/images/score.png'" /></div>-->
      <!--<div class="name">每日签到可获得积分奖励</div>-->
@ -111,6 +112,12 @@ export default {
    !this.loading && this.getInfo();
  },
  methods: {
+    goSignIn() {
+      this.$yrouter.push("/pages/user/signIn/Sign/index");
+    },
+    goHome() {
+      this.$yrouter.switchTab("/pages/home/index");
+    },
    nav: function(index) {
      this.current = index;
    },
@ -146,7 +153,6 @@ export default {
 };
 </script>
 <style>
- 
 .list {
 }
 </style>
--- a/pages/user/signIn/Sign/index.vue
+++ b/pages/user/signIn/Sign/index.vue
@ -13,10 +13,7 @@
            </div>
          </div>
        </div>
-        <div
-          @click="$yrouter.push('/pages/user/signIn/SignRecord/index')"
-          class="right acea-row row-middle"
-        >
+        <div @click="goSignRecord()" class="right acea-row row-middle">
          <div class="iconfont icon-caidan"></div>
          <div>明细</div>
        </div>
@ -78,7 +75,7 @@
          <div class="num font-color-red">+{{ item.number }}</div>
        </div>
        <div
-          @click="$yrouter.push('/pages/user/signIn/SignRecord/index')"
+          @click="goSignRecord()"
          class="Loads acea-row row-center-wrapper"
          v-if="signList.length > 0"
        >
@ -139,6 +136,9 @@ export default {
    this.getSignList();
  },
  methods: {
+    goSignRecord() {
+      this.$yrouter.push("/pages/user/signIn/SignRecord/index");
+    },
    // js给数字补0；num：需要补0的数字，length：长度（补到多少位）；
    PrefixInteger: function(num, length) {
      return (Array(length).join("0") + num).slice(-length).split("");
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/components/AddressWindow.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/components/AddressWindow.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/components/Footer.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/components/Footer.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/components/GoodList.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/components/GoodList.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/components/OrderGoods.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/components/OrderGoods.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/components/PromotionGood.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/components/PromotionGood.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/components/Recommend.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/components/Recommend.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/components/SwitchWindow.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/components/SwitchWindow.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/11111/11111.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/11111/11111.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/Loading/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/Loading/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/NotDefined/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/NotDefined/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/BargainRecord/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/BargainRecord/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/DargainDetails/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/DargainDetails/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/GoodsBargain/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/GoodsBargain/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/GoodsGroup/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/GoodsGroup/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/GoodsSeckill/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/GoodsSeckill/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/GroupDetails/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/GroupDetails/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/GroupRule/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/GroupRule/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/Poster/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/Poster/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/SeckillDetails/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/SeckillDetails/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/authorization/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/authorization/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/launch/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/launch/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/GoodsReturn/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/GoodsReturn/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/MyOrder/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/MyOrder/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/OrderDetails/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/OrderDetails/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/OrderSubmission/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/OrderSubmission/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/ReturnList/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/ReturnList/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderAdmin/AdminOrder/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderAdmin/AdminOrder/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderAdmin/AdminOrderList/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderAdmin/AdminOrderList/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderAdmin/GoodsDeliver/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderAdmin/GoodsDeliver/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderAdmin/OrderCancellation/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderAdmin/OrderCancellation/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderAdmin/OrderIndex/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderAdmin/OrderIndex/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderAdmin/Statistics/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderAdmin/Statistics/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/GoodSearch/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/GoodSearch/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/GoodsClass/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/GoodsClass/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/GoodsCollection/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/GoodsCollection/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/GoodsCon/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/GoodsCon/index.js.map
--- a/Show More
+++ b/Show More