From d3c3b379d1f2b5264806a3c8efe0ff2010ba6718 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Wed, 18 May 2022 17:41:38 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=89=8D=E7=AB=AF=E6=A8=A1=E7=89=88?=
 =?UTF-8?q?=E3=80=91=E6=9B=B4=E6=96=B0v4.4.4=E6=A8=A1=E7=89=88=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/.env.dev                       |    6 +-
 template/admin/package.json                   |    2 +-
 .../pages/marketing/storeBargain/create.vue   |    2 +-
 .../marketing/storeCombination/create.vue     |    2 +-
 .../pages/marketing/storeIntegral/create.vue  |    2 +-
 .../pages/marketing/storeSeckill/create.vue   |    2 +-
 .../src/pages/product/productAdd/index.vue    |    2 +-
 .../src/pages/setting/notification/index.vue  |  109 +-
 .../setting/notification/notificationEdit.vue |  371 ++-
 .../admin/src/pages/system/configTab/list.vue |    8 +-
 template/uni-app/App.vue                      |  148 +-
 template/uni-app/androidPrivacy.json          |    2 +-
 .../uni-app/components/d_goodList/index.vue   |  370 +--
 .../uni-app/components/goodClass/index.vue    |  428 ++--
 template/uni-app/libs/login.js                |   44 +-
 template/uni-app/manifest.json                |   11 +-
 template/uni-app/pages.json                   |    8 +-
 .../uni-app/pages/goods_cate/goods_cate.vue   |  213 +-
 .../uni-app/pages/goods_cate/goods_cate2.vue  | 2073 ++++++++--------
 .../uni-app/pages/goods_cate/goods_cate3.vue  | 2179 +++++++++--------
 template/uni-app/pages/user/index.vue         |  109 +-
 .../pages/users/order_confirm/index.vue       |    3 +-
 .../pages/users/order_details/index.vue       |    5 +-
 .../uni-app/pages/users/order_list/index.vue  |    3 +
 .../uni-app/pages/users/user_info/index.vue   |    2 +-
 .../pages/users/user_spread_user/index.vue    |    8 +-
 template/uni-app/store/modules/app.js         |    4 +-
 27 files changed, 3049 insertions(+), 3067 deletions(-)

diff --git a/template/admin/.env.dev b/template/admin/.env.dev
index 5b7c43ae5..b70e9f851 100644
--- a/template/admin/.env.dev
+++ b/template/admin/.env.dev
@@ -4,11 +4,11 @@ VUE_APP_ENV='dev'
 # 页面 title
 VUE_APP_TITLE=CRMEB
 # socket 客服连接地址
-VUE_APP_WS_KEFU_URL="ws://v4.crmeb.net/msg"
+VUE_APP_WS_KEFU_URL=""
 # socket 系统连接地址
-VUE_APP_WS_ADMIN_URL="ws://v4.crmeb.net/notice"
+VUE_APP_WS_ADMIN_URL=""
 
 
 
 # 接口请求地址
-VUE_APP_API_URL='http://v4.crmeb.net/adminapi'
+VUE_APP_API_URL=''
diff --git a/template/admin/package.json b/template/admin/package.json
index c36587b8f..c7ed0ef27 100644
--- a/template/admin/package.json
+++ b/template/admin/package.json
@@ -117,4 +117,4 @@
       "git add"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/template/admin/src/pages/marketing/storeBargain/create.vue b/template/admin/src/pages/marketing/storeBargain/create.vue
index 25fb2cc27..d57ec6050 100644
--- a/template/admin/src/pages/marketing/storeBargain/create.vue
+++ b/template/admin/src/pages/marketing/storeBargain/create.vue
@@ -1034,7 +1034,7 @@ export default {
     // 选择商品
     changeGoods() {
       this.modals = true;
-      this.$refs.goodslist.formValidate.is_virtual = 0;
+      this.$refs.goodslist.formValidate.is_presale = 0;
       this.$refs.goodslist.getList();
       this.$refs.goodslist.goodsCategory();
     },
diff --git a/template/admin/src/pages/marketing/storeCombination/create.vue b/template/admin/src/pages/marketing/storeCombination/create.vue
index 5d4c07af3..a7fb7b0d0 100644
--- a/template/admin/src/pages/marketing/storeCombination/create.vue
+++ b/template/admin/src/pages/marketing/storeCombination/create.vue
@@ -985,7 +985,7 @@ export default {
     // 选择商品
     changeGoods() {
       this.modals = true;
-      this.$refs.goodslist.formValidate.is_virtual = 0;
+      this.$refs.goodslist.formValidate.is_presale = 0;
       this.$refs.goodslist.getList();
       this.$refs.goodslist.goodsCategory();
     },
diff --git a/template/admin/src/pages/marketing/storeIntegral/create.vue b/template/admin/src/pages/marketing/storeIntegral/create.vue
index 9155c8147..a5b4d9140 100644
--- a/template/admin/src/pages/marketing/storeIntegral/create.vue
+++ b/template/admin/src/pages/marketing/storeIntegral/create.vue
@@ -745,7 +745,7 @@ export default {
     // 选择商品
     changeGoods() {
       this.modals = true;
-      this.$refs.goodslist.formValidate.is_virtual = 0;
+      this.$refs.goodslist.formValidate.is_presale = 0;
       this.$refs.goodslist.getList();
       this.$refs.goodslist.goodsCategory();
     }, // 移动
diff --git a/template/admin/src/pages/marketing/storeSeckill/create.vue b/template/admin/src/pages/marketing/storeSeckill/create.vue
index 45372e098..dcdacab86 100644
--- a/template/admin/src/pages/marketing/storeSeckill/create.vue
+++ b/template/admin/src/pages/marketing/storeSeckill/create.vue
@@ -935,7 +935,7 @@ export default {
     // 选择商品
     changeGoods() {
       this.modals = true;
-      this.$refs.goodslist.formValidate.is_virtual = 0;
+      this.$refs.goodslist.formValidate.is_presale = 0;
       this.$refs.goodslist.getList();
       this.$refs.goodslist.goodsCategory();
     }, // 移动
diff --git a/template/admin/src/pages/product/productAdd/index.vue b/template/admin/src/pages/product/productAdd/index.vue
index db905b177..5b3aaef5e 100644
--- a/template/admin/src/pages/product/productAdd/index.vue
+++ b/template/admin/src/pages/product/productAdd/index.vue
@@ -1439,7 +1439,7 @@
           <Col span="24">
             <div class="line"></div>
           </Col>
-          <Col span="24" v-if="formValidate.virtual_type == 0">
+          <Col span="24" v-if="formValidate.virtual_type == 0 || formValidate.virtual_type == 3">
             <FormItem label="预售商品：">
               <i-switch v-model="formValidate.presale" size="large">
                 <span slot="open">开启</span>
diff --git a/template/admin/src/pages/setting/notification/index.vue b/template/admin/src/pages/setting/notification/index.vue
index 4e1776bf5..ad158537a 100644
--- a/template/admin/src/pages/setting/notification/index.vue
+++ b/template/admin/src/pages/setting/notification/index.vue
@@ -2,56 +2,7 @@
   <div class="message">
     <div class="i-layout-page-header">
         <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
-        <div class="ivu-mt">
-          <Alert v-if="industry" type="info" banner closable>
-            <template slot="desc" >
-              <div>
-                <p>
-                  1、请在微信后台设置模版消息主营行业：{{
-                    industry.primary_industry.first_class
-                        ? industry.primary_industry.first_class + "||"
-                        : industry.primary_industry
-                  }}
-                  {{
-                    industry.primary_industry.second_class
-                        ? industry.primary_industry.second_class
-                        : ""
-                  }}
-                  ||  副营行业：{{
-                    industry.secondary_industry.first_class
-                        ? industry.secondary_industry.first_class + "||"
-                        : industry.secondary_industry
-                  }}
-                  {{
-                    industry.secondary_industry.second_class
-                        ? industry.secondary_industry.second_class
-                        : ""
-                  }}
-                </p>
-                <p>2、点击同步按钮会自动在微信后台添加模版消息</p>
-              </div>
-            </template>
-          </Alert>
-          <Row type="flex" class="mb20">
-            <Col v-bind="grid">
-              <Button
-                  v-auth="['app-wechat-template-sync']"
-                  icon="md-list"
-                  type="success"
-                  @click="routineTemplate"
-                  style="margin-left: 20px"
-              >同步小程序订阅消息</Button
-              >
-              <Button
-                  v-auth="['app-wechat-template-sync']"
-                  icon="md-list"
-                  type="success"
-                  @click="wechatTemplate"
-                  style="margin-left: 20px"
-              >同步微信模版消息</Button
-              >
-            </Col>
-          </Row>
+        <div>
           <Tabs v-model="currentTab" @on-click="changeTab">
             <TabPane
               :label="item.label"
@@ -62,11 +13,56 @@
           </Tabs>
         </div>
       </div>
-      <div class="ivu-row">
-
+      <div class="table-box">
         <Card :bordered="false" dis-hover class="ivu-mt">
-
-
+          <Row type="flex" class="mb20" v-if="currentTab == 1">
+            <Col v-bind="grid">
+              <Button
+                v-auth="['app-wechat-template-sync']"
+                icon="md-list"
+                type="success"
+                @click="routineTemplate"
+                style="margin-left: 20px"
+                >同步小程序订阅消息</Button
+              >
+              <Button
+                v-auth="['app-wechat-template-sync']"
+                icon="md-list"
+                type="success"
+                @click="wechatTemplate"
+                style="margin-left: 20px"
+                >同步微信模版消息</Button
+              >
+            </Col>
+          </Row>
+          <Alert v-if="industry && currentTab == 1">
+            <template slot="desc">
+              <div>
+                主营行业：{{
+                  industry.primary_industry.first_class
+                    ? industry.primary_industry.first_class + "||"
+                    : industry.primary_industry
+                }}
+                {{
+                  industry.primary_industry.second_class
+                    ? industry.primary_industry.second_class
+                    : ""
+                }}
+              </div>
+              <div>
+                副营行业：{{
+                  industry.secondary_industry.first_class
+                    ? industry.secondary_industry.first_class + "||"
+                    : industry.secondary_industry
+                }}
+                {{
+                  industry.secondary_industry.second_class
+                    ? industry.secondary_industry.second_class
+                    : ""
+                }}
+              </div>
+            </template>
+          </Alert>
           <Table
             :columns="currentTab == 1 ?columns : columns2"
             :data="levelLists"
@@ -96,7 +92,7 @@
               ]"
               :slot="item"
             >
-              <div v-if="item === 'is_ent_wechat' && currentTab == 1">--</div>
+              <div v-if="item === 'is_ent_wechat' && currentTab == 1">--</div>  
               <i-switch
                 v-model="row[item]"
                 :value="row[item]"
@@ -348,7 +344,4 @@ export default {
 .table {
   padding: 0 18px;
 }
-.ivu-alert-with-desc {
-  padding: 5px 16px;
-}
 </style>
diff --git a/template/admin/src/pages/setting/notification/notificationEdit.vue b/template/admin/src/pages/setting/notification/notificationEdit.vue
index e69c15e76..b9e109985 100644
--- a/template/admin/src/pages/setting/notification/notificationEdit.vue
+++ b/template/admin/src/pages/setting/notification/notificationEdit.vue
@@ -1,228 +1,150 @@
 <template>
   <div class="edit">
-    <div class="i-layout-page-header">
+    <!-- <div class="i-layout-page-header">
       <router-link :to="{ path: '/admin/setting/notification/index' }"
-      ><Button icon="ios-arrow-back" size="small" type="text"
-      >返回</Button
-      ></router-link
+        ><Button icon="ios-arrow-back" size="small" class="mr20"
+          >返回</Button
+        ></router-link
       >
-      <Divider type="vertical" />
       <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
+    </div> -->
+    <div class="i-layout-page-header header_top">
+      <div class="i-layout-page-header fl_header">
+        <router-link :to="{ path: '/admin/setting/notification/index' }"><Button icon="ios-arrow-back" size="small"
+            type="text">返回</Button></router-link>
+        <Divider type="vertical" />
+        <span class="ivu-page-header-title mr20" style="padding: 0" v-text="$route.meta.title"></span>
+      </div>
     </div>
     <div class="tabs">
       <Row :gutter="32">
         <Col span="32" class="demo-tabs-style1" style="padding: 16px">
-          <Tabs @on-click="changeTabs">
-            <TabPane
-              v-for="(item, index) in tabsList"
-              :key="index"
-              :name="item.slot"
-              :label="item.title"
-            >
-              <Form
-                class="form-sty"
-                ref="formData"
-                :model="formData"
-                :rules="ruleValidate"
-                :label-width="80"
-              >
-                <div v-if="item.slot === 'is_system' && !loading">
-                  <FormItem label="通知标题">
-                    <Input
-                      v-model="formData.system_title"
-                      placeholder="请输入通知标题"
-                      style="width: 500px"
-                    ></Input>
-                  </FormItem>
-                  <FormItem label="通知内容">
-                    <div class="content">
-                      <Input
-                        v-model="formData.system_text"
-                        type="textarea"
-                        :autosize="{ minRows: 5, maxRows: 8 }"
-                        placeholder="请输入通知内容"
-                        style="width: 500px"
-                      ></Input>
-                      <div class="trip">
-                        <div>
-                          请输入模板消息详细内容对应的变量。关键字个数需与已添加的模板一致。
-                          可以使用如下变量：
-                        </div>
-                        <div
-                          v-for="(item, index) in formData.variable.split(',')"
-                          :key="index"
-                        >
-                          {{ item }}
-                        </div>
-                      </div>
-                    </div>
-                  </FormItem>
-                  <FormItem label="状态" prop="is_system">
-                    <RadioGroup v-model="formData.is_system">
-                      <Radio :label="1">开启</Radio>
-                      <Radio :label="2">关闭</Radio>
-                    </RadioGroup>
-                  </FormItem>
-                </div>
-                <div v-if="item.slot === 'is_sms' && !loading">
-                  <FormItem label="短信模版ID">
-                    <Input
-                      v-model="formData.sms_id"
-                      placeholder="短信模版ID"
-                      style="width: 500px"
-                    ></Input>
-                  </FormItem>
-                  <FormItem label="通知内容">
-                    <div class="content">
-                      <Input
-                        v-model="formData.content"
-                        type="textarea"
-                        disabled
-                        :autosize="{ minRows: 5, maxRows: 8 }"
-                        placeholder="请输入通知内容"
-                        style="width: 500px"
-                      ></Input>
-                    </div>
-                  </FormItem>
-                  <FormItem label="状态" prop="is_sms">
-                    <RadioGroup v-model="formData.is_sms">
-                      <Radio :label="1">开启</Radio>
-                      <Radio :label="2">关闭</Radio>
-                    </RadioGroup>
-                  </FormItem>
-                </div>
-                <div v-else-if="item.slot === 'is_wechat' && !loading">
-                  <FormItem label="ID">
-                    <Input
-                      v-model="formData.templage_message_id"
-                      disabled
-                      placeholder="请输入通模板编号"
-                      style="width: 500px"
-                    ></Input>
-                  </FormItem>
-                  <FormItem label="模板编号">
-                    <Input
-                      v-model="formData.tempkey"
-                      disabled
-                      placeholder="请输入通模板编号"
-                      style="width: 500px"
-                    ></Input>
-                  </FormItem>
-                  <FormItem label="模板">
-                    <Input
-                      disabled
-                      v-model="formData.content"
-                      type="textarea"
-                      :autosize="{ minRows: 5, maxRows: 8 }"
-                      placeholder="请输入模板"
-                      style="width: 500px"
-                    ></Input>
-                  </FormItem>
-                  <FormItem label="模板ID">
-                    <Input
-                      v-model="formData.tempid"
-                      placeholder="请输入模板ID"
-                      style="width: 500px"
-                    ></Input>
-                  </FormItem>
-                  <FormItem label="状态" prop="is_wechat">
-                    <RadioGroup v-model="formData.is_wechat">
-                      <Radio :label="1">开启</Radio>
-                      <Radio :label="2">关闭</Radio>
-                    </RadioGroup>
-                  </FormItem>
-                </div>
-                <div v-else-if="item.slot === 'is_routine' && !loading">
-                  <FormItem label="ID">
-                    <Input
-                      v-model="formData.templage_message_id"
-                      disabled
-                      placeholder="请输入通模板编号"
-                      style="width: 500px"
-                    ></Input>
-                  </FormItem>
-                  <FormItem label="模板编号">
-                    <Input
-                      v-model="formData.tempkey"
-                      disabled
-                      placeholder="请输入通模板编号"
-                      style="width: 500px"
-                    ></Input>
-                  </FormItem>
-                  <FormItem label="模板">
-                    <Input
-                      disabled
-                      v-model="formData.content"
-                      type="textarea"
-                      :autosize="{ minRows: 5, maxRows: 8 }"
-                      placeholder="请输入模板"
-                      style="width: 500px"
-                    ></Input>
-                  </FormItem>
-                  <FormItem label="模板ID">
-                    <Input
-                      v-model="formData.tempid"
-                      placeholder="请输入模板ID"
-                      style="width: 500px"
-                    ></Input>
-                  </FormItem>
-                  <FormItem label="状态" prop="is_routine">
-                    <RadioGroup v-model="formData.is_routine">
-                      <Radio :label="1">开启</Radio>
-                      <Radio :label="2">关闭</Radio>
-                    </RadioGroup>
-                  </FormItem>
-                </div>
-
-                <div v-else-if="item.slot === 'is_ent_wechat' && !loading">
-                  <FormItem label="通知内容">
-                    <div class="content">
-                      <Input
-                        v-model="formData.ent_wechat_text"
-                        type="textarea"
-                        :autosize="{ minRows: 5, maxRows: 8 }"
-                        placeholder="请输入通知内容"
-                        style="width: 500px"
-                      ></Input>
-                      <div class="trip">
-                        <div>
-                          请输入模板消息详细内容对应的变量。关键字个数需与已添加的模板一致。
-                          可以使用如下变量：
-                        </div>
-                        <div
-                          v-for="(item, index) in formData.variable.split(',')"
-                          :key="index"
-                        >
-                          {{ item }}
-                        </div>
-                      </div>
-                    </div>
-                  </FormItem>
-                  <FormItem label="机器人链接">
-                    <div class="content">
-                      <Input
-                        v-model="formData.url"
-                        placeholder="请输入机器人链接"
-                        style="width: 500px"
-                      ></Input>
-                      <div class="trip">企业微信群机器人链接</div>
-                    </div>
-                  </FormItem>
-                  <FormItem label="状态" prop="is_ent_wechat">
-                    <RadioGroup v-model="formData.is_ent_wechat">
-                      <Radio :label="1">开启</Radio>
-                      <Radio :label="2">关闭</Radio>
-                    </RadioGroup>
-                  </FormItem>
-                </div>
-                <FormItem>
-                  <Button type="primary" @click="handleSubmit('formData')"
-                    >提交</Button
-                  >
+        <Tabs @on-click="changeTabs">
+          <TabPane v-for="(item, index) in tabsList" :key="index" :name="item.slot" :label="item.title">
+            <Form class="form-sty" ref="formData" :model="formData" :rules="ruleValidate" :label-width="80">
+              <div v-if="item.slot === 'is_system' && !loading">
+                <FormItem label="通知标题">
+                  <Input v-model="formData.system_title" placeholder="请输入通知标题" style="width: 500px"></Input>
                 </FormItem>
-              </Form>
-            </TabPane>
-          </Tabs>
+                <FormItem label="通知内容">
+                  <div class="content">
+                    <Input v-model="formData.system_text" type="textarea" :autosize="{ minRows: 5, maxRows: 8 }"
+                      placeholder="请输入通知内容" style="width: 500px"></Input>
+                    <div class="trip">
+                      <div>
+                        请输入模板消息详细内容对应的变量。关键字个数需与已添加的模板一致。
+                        可以使用如下变量：
+                      </div>
+                      <div v-for="(item, index) in formData.variable.split(',')" :key="index">
+                        {{ item }}
+                      </div>
+                    </div>
+                  </div>
+                </FormItem>
+                <FormItem label="状态" prop="is_system">
+                  <RadioGroup v-model="formData.is_system">
+                    <Radio :label="1">开启</Radio>
+                    <Radio :label="2">关闭</Radio>
+                  </RadioGroup>
+                </FormItem>
+              </div>
+              <div v-if="item.slot === 'is_sms' && !loading">
+                <FormItem label="短信模版ID">
+                  <Input v-model="formData.sms_id" placeholder="短信模版ID" style="width: 500px"></Input>
+                </FormItem>
+                <FormItem label="通知内容">
+                  <div class="content">
+                    <Input v-model="formData.content" type="textarea" disabled :autosize="{ minRows: 5, maxRows: 8 }"
+                      placeholder="请输入通知内容" style="width: 500px"></Input>
+                  </div>
+                </FormItem>
+                <FormItem label="状态" prop="is_sms">
+                  <RadioGroup v-model="formData.is_sms">
+                    <Radio :label="1">开启</Radio>
+                    <Radio :label="2">关闭</Radio>
+                  </RadioGroup>
+                </FormItem>
+              </div>
+              <div v-else-if="item.slot === 'is_wechat' && !loading">
+                <FormItem label="ID">
+                  <Input v-model="formData.templage_message_id" disabled placeholder="请输入通模板编号"
+                    style="width: 500px"></Input>
+                </FormItem>
+                <FormItem label="模板编号">
+                  <Input v-model="formData.tempkey" disabled placeholder="请输入通模板编号" style="width: 500px"></Input>
+                </FormItem>
+                <FormItem label="模板">
+                  <Input disabled v-model="formData.content" type="textarea" :autosize="{ minRows: 5, maxRows: 8 }"
+                    placeholder="请输入模板" style="width: 500px"></Input>
+                </FormItem>
+                <FormItem label="模板ID">
+                  <Input v-model="formData.tempid" placeholder="请输入模板ID" style="width: 500px"></Input>
+                </FormItem>
+                <FormItem label="状态" prop="is_wechat">
+                  <RadioGroup v-model="formData.is_wechat">
+                    <Radio :label="1">开启</Radio>
+                    <Radio :label="2">关闭</Radio>
+                  </RadioGroup>
+                </FormItem>
+              </div>
+              <div v-else-if="item.slot === 'is_routine' && !loading">
+                <FormItem label="ID">
+                  <Input v-model="formData.templage_message_id" disabled placeholder="请输入通模板编号"
+                    style="width: 500px"></Input>
+                </FormItem>
+                <FormItem label="模板编号">
+                  <Input v-model="formData.tempkey" disabled placeholder="请输入通模板编号" style="width: 500px"></Input>
+                </FormItem>
+                <FormItem label="模板">
+                  <Input disabled v-model="formData.content" type="textarea" :autosize="{ minRows: 5, maxRows: 8 }"
+                    placeholder="请输入模板" style="width: 500px"></Input>
+                </FormItem>
+                <FormItem label="模板ID">
+                  <Input v-model="formData.tempid" placeholder="请输入模板ID" style="width: 500px"></Input>
+                </FormItem>
+                <FormItem label="状态" prop="is_routine">
+                  <RadioGroup v-model="formData.is_routine">
+                    <Radio :label="1">开启</Radio>
+                    <Radio :label="2">关闭</Radio>
+                  </RadioGroup>
+                </FormItem>
+              </div>
+
+              <div v-else-if="item.slot === 'is_ent_wechat' && !loading">
+                <FormItem label="通知内容">
+                  <div class="content">
+                    <Input v-model="formData.ent_wechat_text" type="textarea" :autosize="{ minRows: 5, maxRows: 8 }"
+                      placeholder="请输入通知内容" style="width: 500px"></Input>
+                    <div class="trip">
+                      <div>
+                        请输入模板消息详细内容对应的变量。关键字个数需与已添加的模板一致。
+                        可以使用如下变量：
+                      </div>
+                      <div v-for="(item, index) in formData.variable.split(',')" :key="index">
+                        {{ item }}
+                      </div>
+                    </div>
+                  </div>
+                </FormItem>
+                <FormItem label="机器人链接">
+                  <div class="content">
+                    <Input v-model="formData.url" placeholder="请输入机器人链接" style="width: 500px"></Input>
+                    <div class="trip">企业微信群机器人链接</div>
+                  </div>
+                </FormItem>
+                <FormItem label="状态" prop="is_ent_wechat">
+                  <RadioGroup v-model="formData.is_ent_wechat">
+                    <Radio :label="1">开启</Radio>
+                    <Radio :label="2">关闭</Radio>
+                  </RadioGroup>
+                </FormItem>
+              </div>
+              <FormItem>
+                <Button type="primary" @click="handleSubmit('formData')">提交</Button>
+              </FormItem>
+            </Form>
+          </TabPane>
+        </Tabs>
         </Col>
       </Row>
     </div>
@@ -334,30 +256,33 @@ export default {
 </script>
 
 <style scoped>
-.edit {
+.edit {}
+.header_top{
+  margin-bottom: 10px;
 }
-.demo-tabs-style1 > .ivu-tabs-card > .ivu-tabs-content {
+.demo-tabs-style1>.ivu-tabs-card>.ivu-tabs-content {
   height: 120px;
   margin-top: -16px;
 }
 
-.demo-tabs-style1 > .ivu-tabs-card > .ivu-tabs-content > .ivu-tabs-tabpane {
+.demo-tabs-style1>.ivu-tabs-card>.ivu-tabs-content>.ivu-tabs-tabpane {
   background: #fff;
   padding: 16px;
 }
 
-.demo-tabs-style1 > .ivu-tabs.ivu-tabs-card > .ivu-tabs-bar .ivu-tabs-tab {
+.demo-tabs-style1>.ivu-tabs.ivu-tabs-card>.ivu-tabs-bar .ivu-tabs-tab {
   border-color: transparent;
 }
 
-.demo-tabs-style1 > .ivu-tabs-card > .ivu-tabs-bar .ivu-tabs-tab-active {
+.demo-tabs-style1>.ivu-tabs-card>.ivu-tabs-bar .ivu-tabs-tab-active {
   border-color: #fff;
 }
+
 .tabs {
   padding: 0 30px;
   background-color: #fff;
-  margin-top: 20px;
 }
+
 .trip {
   color: rgb(146, 139, 139);
   background-color: #f2f2f2;
@@ -365,10 +290,12 @@ export default {
   border-radius: 4px;
   padding: 15px;
 }
+
 .content {
   display: flex;
 }
+
 .form-sty {
   margin-top: 20px;
 }
-</style>
+</style>  
diff --git a/template/admin/src/pages/system/configTab/list.vue b/template/admin/src/pages/system/configTab/list.vue
index cbb23bca6..8ce364b56 100644
--- a/template/admin/src/pages/system/configTab/list.vue
+++ b/template/admin/src/pages/system/configTab/list.vue
@@ -1,13 +1,9 @@
 <template>
   <div>
     <div class="i-layout-page-header">
-        <router-link :to="{ path: '/admin/system/config/system_config_tab/index' }"
-        ><Button icon="ios-arrow-back" size="small" type="text"
-        >返回</Button
-        ></router-link
-        >
-        <Divider type="vertical" />
+      <div class="i-layout-page-header">
         <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
+      </div>
     </div>
     <Card :bordered="false" dis-hover class="ivu-mt">
       <Row type="flex">
diff --git a/template/uni-app/App.vue b/template/uni-app/App.vue
index 49d059a6d..7d8ce3fd6 100644
--- a/template/uni-app/App.vue
+++ b/template/uni-app/App.vue
@@ -218,85 +218,85 @@
 			}
 
 			//公众号静默授权
-			if (window.location.pathname !== '/' && option.query.scope === 'snsapi_base') {
-				let snsapiBase = 'snsapi_base';
-				let urlData = location.pathname + location.search;
-				// if (!that.$store.getters.isLogin && uni.getStorageSync('authIng')) {
-				// 	uni.setStorageSync('authIng', false)
-				// }
-				if (!that.$store.getters.isLogin && Auth.isWeixin()) {
-					let code,
-						state,
-						scope = ''
+			// if (window.location.pathname !== '/' && option.query.scope === 'snsapi_base') {
+			// 	let snsapiBase = 'snsapi_base';
+			// 	let urlData = location.pathname + location.search;
+			// 	// if (!that.$store.getters.isLogin && uni.getStorageSync('authIng')) {
+			// 	// 	uni.setStorageSync('authIng', false)
+			// 	// }
+			// 	if (!that.$store.getters.isLogin && Auth.isWeixin()) {
+			// 		let code,
+			// 			state,
+			// 			scope = ''
 
-					if (option.query.code instanceof Array) {
-						code = option.query.code[option.query.code.length - 1]
-					} else {
-						code = option.query.code
-					}
+			// 		if (option.query.code instanceof Array) {
+			// 			code = option.query.code[option.query.code.length - 1]
+			// 		} else {
+			// 			code = option.query.code
+			// 		}
 
 
-					if (code && code != uni.getStorageSync('snsapiCode') && location.pathname.indexOf(
-							'/pages/users/wechat_login/index') === -1) {
-						// 存储静默授权code
-						uni.setStorageSync('snsapiCode', code);
-						let spread = that.globalData.spid ? that.globalData.spid : '';
-						uni.setStorageSync('authIng', true)
-						silenceAuth({
-								code: code,
-								spread: that.$Cache.get('spread'),
-								spid: that.globalData.code
-							})
-							.then(res => {
-								uni.setStorageSync('authIng', false)
-								uni.setStorageSync('snRouter', decodeURIComponent(decodeURIComponent(option.query
-									.back_url)));
-								if (res.data.key !== undefined && res.data.key) {
-									this.$Cache.set('snsapiKey', res.data.key);
-								} else {
+			// 		if (code && code != uni.getStorageSync('snsapiCode') && location.pathname.indexOf(
+			// 				'/pages/users/wechat_login/index') === -1) {
+			// 			// 存储静默授权code
+			// 			uni.setStorageSync('snsapiCode', code);
+			// 			let spread = that.globalData.spid ? that.globalData.spid : '';
+			// 			uni.setStorageSync('authIng', true)
+			// 			silenceAuth({
+			// 					code: code,
+			// 					spread: that.$Cache.get('spread'),
+			// 					spid: that.globalData.code
+			// 				})
+			// 				.then(res => {
+			// 					uni.setStorageSync('authIng', false)
+			// 					uni.setStorageSync('snRouter', decodeURIComponent(decodeURIComponent(option.query
+			// 						.back_url)));
+			// 					if (res.data.key !== undefined && res.data.key) {
+			// 						this.$Cache.set('snsapiKey', res.data.key);
+			// 					} else {
 
-									let time = res.data.expires_time - this.$Cache.time();
-									this.$store.commit('LOGIN', {
-										token: res.data.token,
-										time: time
-									});
-									this.$Cache.set('WX_AUTH', code);
-									this.$store.commit('SETUID', res.data.userInfo.uid);
-									this.$store.commit('UPDATE_USERINFO', res.data.userInfo);
+			// 						let time = res.data.expires_time - this.$Cache.time();
+			// 						this.$store.commit('LOGIN', {
+			// 							token: res.data.token,
+			// 							time: time
+			// 						});
+			// 						this.$Cache.set('WX_AUTH', code);
+			// 						this.$store.commit('SETUID', res.data.userInfo.uid);
+			// 						this.$store.commit('UPDATE_USERINFO', res.data.userInfo);
 
-									if (option.query.back_url) {
-										location.replace(decodeURIComponent(decodeURIComponent(option.query
-											.back_url)));
-									}
-								}
-							})
-							.catch(error => {
-								uni.setStorageSync('authIng', false)
-								let url = ''
-								if (option.query.back_url instanceof Array) {
-									url = option.query.back_url[option.query.back_url.length - 1]
-								} else {
-									url = option.query.back_url
-								}
-								if (!that.$Cache.has('snsapiKey')) {
-									if (location.pathname.indexOf('/pages/users/wechat_login/index') === -1) {
-										Auth.oAuth(snsapiBase, url);
-									}
-								}
-							});
-					} else {
-						if (!this.$Cache.has('snsapiKey')) {
-							if (location.pathname.indexOf('/pages/users/wechat_login/index') === -1) {
-								Auth.oAuth(snsapiBase, urlData);
-							}
-						}
-					}
-				} else {
-					if (option.query.back_url) {
-						location.replace(uni.getStorageSync('snRouter'));
-					}
-				}
-			}
+			// 						if (option.query.back_url) {
+			// 							location.replace(decodeURIComponent(decodeURIComponent(option.query
+			// 								.back_url)));
+			// 						}
+			// 					}
+			// 				})
+			// 				.catch(error => {
+			// 					uni.setStorageSync('authIng', false)
+			// 					let url = ''
+			// 					if (option.query.back_url instanceof Array) {
+			// 						url = option.query.back_url[option.query.back_url.length - 1]
+			// 					} else {
+			// 						url = option.query.back_url
+			// 					}
+			// 					if (!that.$Cache.has('snsapiKey')) {
+			// 						if (location.pathname.indexOf('/pages/users/wechat_login/index') === -1) {
+			// 							Auth.oAuth(snsapiBase, url);
+			// 						}
+			// 					}
+			// 				});
+			// 		} else {
+			// 			if (!this.$Cache.has('snsapiKey')) {
+			// 				if (location.pathname.indexOf('/pages/users/wechat_login/index') === -1) {
+			// 					Auth.oAuth(snsapiBase, urlData);
+			// 				}
+			// 			}
+			// 		}
+			// 	} else {
+			// 		if (option.query.back_url) {
+			// 			location.replace(uni.getStorageSync('snRouter'));
+			// 		}
+			// 	}
+			// }
 			// #endif
 			// #ifdef MP
 			// 小程序静默授权
diff --git a/template/uni-app/androidPrivacy.json b/template/uni-app/androidPrivacy.json
index 05599567e..917e0f4af 100644
--- a/template/uni-app/androidPrivacy.json
+++ b/template/uni-app/androidPrivacy.json
@@ -3,7 +3,7 @@
     "prompt" : "template",
     "title" : "用户协议与隐私政策",
     "message" : "\t请务必审慎阅读、充分理解“用户协议与 隐私政策”各条款，包括但不限于：为了 向你提供即时通讯、内容分享等服务，我 们需要收集你的设备信息、操作日志等个 人信息。你可以在“设置”中查看、变更、删除个人信息并管理你的授权。<br/>
- 你可以阅读 <a href=\"/pages/columnGoods/static/yhxy.html\">《用户协议》</a>与 <a href=\"/pages/columnGoods/static/yszc.html\">《隐私政策》</a>了解详细信息。如你同意，请点击“我同意”开始接受我们的服务。",
+ 你可以阅读 <a href=\"pages/columnGoods/static/yhxy.html\">《用户协议》</a>与 <a href=\"pages/columnGoods/static/yszc.html\">《隐私政策》</a>了解详细信息。如你同意，请点击“我同意”开始接受我们的服务。",
     "buttonAccept" : "同意并接受",
     "buttonRefuse" : "暂不同意",
     "second" : {
diff --git a/template/uni-app/components/d_goodList/index.vue b/template/uni-app/components/d_goodList/index.vue
index a8d2c2389..b2b384e78 100644
--- a/template/uni-app/components/d_goodList/index.vue
+++ b/template/uni-app/components/d_goodList/index.vue
@@ -1,183 +1,189 @@
-<template>
-	<view class="goodsList">
-		<view class="item" v-for="(item,index) in tempArr" :key='index' @click="goDetail(item)">
-			<view class="pictrue">
-				<span class="pictrue_log pictrue_log_class" v-if="item.activity && item.activity.type === '1'">秒杀</span>
-				<span class="pictrue_log pictrue_log_class" v-if="item.activity && item.activity.type === '2'">砍价</span>
-				<span class="pictrue_log pictrue_log_class" v-if="item.activity && item.activity.type === '3'">拼团</span>
-				<image :src="item.recommend_image" mode="" v-if="item.recommend_image"></image>
-				<image :src="item.image" mode="" v-else></image>
-			</view>
-			<view class="text line2">{{item.store_name}}</view>
-			<view class="bottom acea-row row-between-wrapper">
-				<view class="sales acea-row row-middle">
-					<view class="money font-color"><text>￥</text>{{item.price}}</view>
-					<view>已售 {{item.sales}}</view>
-				</view>
-				<view v-if="item.stock>0">
-					<view class="bnt"
-						v-if="(item.activity && (item.activity.type === '1' || item.activity.type === '2' || item.activity.type === '3') || item.is_virtual) || !item.cart_button">
-						立即购买</view>
-					<view v-else>
-						<!-- 多规格 -->
-						<view class="bnt" @click.stop="goCartDuo(item)" v-if="item.spec_type">
-							加入购物车
-							<view class="num" v-if="isLogin && item.cart_num">{{item.cart_num}}</view>
-						</view>
-						<!-- 单规格 -->
-						<view class="bnt" v-if="!item.spec_type && !item.cart_num" @click.stop="goCartDan(item,index)">
-							加入购物车</view>
-						<view class="cart acea-row row-middle" v-if="!item.spec_type && item.cart_num">
-							<view class="pictrue iconfont icon-jianhao" @click.stop="CartNumDes(index,item)"></view>
-							<view class="num">{{item.cart_num}}</view>
-							<view class="pictrue iconfont icon-jiahao" @click.stop="CartNumAdd(index,item)"></view>
-						</view>
-					</view>
-				</view>
-				<view class="bnt end" v-else>已售罄</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'd_goodList',
-		props: {
-			dataConfig: {
-				type: Object,
-				default: () => {}
-			},
-			tempArr: {
-				type: Array,
-				default: []
-			},
-			isLogin: {
-				type: Boolean,
-				default: false
-			}
-		},
-		data() {
-			return {};
-		},
-		created() {},
-		mounted() {},
-		methods: {
-			goDetail(item) {
-				this.$emit('detail', item);
-			},
-			goCartDuo(item) {
-				this.$emit('gocartduo', item);
-			},
-			goCartDan(item, index) {
-				this.$emit('gocartdan', item, index);
-			},
-			CartNumDes(index, item) {
-				this.$emit('ChangeCartNumDan', false, index, item);
-			},
-			CartNumAdd(index, item) {
-				this.$emit('ChangeCartNumDan', true, index, item);
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	.goodsList {
-		padding: 0 30rpx;
-
-		.item {
-			width: 100%;
-			box-sizing: border-box;
-			margin-bottom: 63rpx;
-
-			.pictrue {
-				width: 100%;
-				height: 290rpx;
-				border-radius: 16rpx;
-				position: relative;
-
-				image {
-					width: 100%;
-					height: 100%;
-					border-radius: 10rpx;
-				}
-			}
-
-			.text {
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #282828;
-				margin: 20rpx 0;
-			}
-
-			.bottom {
-				.sales {
-					font-size: 22rpx;
-					color: #8E8E8E;
-
-					.money {
-						font-size: 42rpx;
-						font-weight: bold;
-						margin-right: 18rpx;
-
-						text {
-							font-size: 28rpx;
-						}
-					}
-				}
-
-				.cart {
-					height: 56rpx;
-
-					.pictrue {
-						color: var(--view-theme);
-						font-size: 46rpx;
-						width: 50rpx;
-						height: 50rpx;
-						text-align: center;
-						line-height: 50rpx;
-					}
-
-					.num {
-						font-size: 30rpx;
-						color: #282828;
-						font-weight: bold;
-						width: 80rpx;
-						text-align: center;
-					}
-				}
-
-				.bnt {
-					padding: 0 30rpx;
-					height: 56rpx;
-					line-height: 56rpx;
-					background: var(--view-theme);
-					border-radius: 42rpx;
-					font-size: 26rpx;
-					color: #fff;
-					position: relative;
-
-					&.end {
-						background: rgba(203, 203, 203, 1);
-					}
-
-					.num {
-						background-color: var(--view-priceColor);
-						min-width: 12rpx;
-						color: #fff;
-						border-radius: 15px;
-						position: absolute;
-						right: -14rpx;
-						top: -15rpx;
-						font-size: 22rpx;
-						padding: 0 10rpx;
-						height: 34rpx;
-						line-height: 34rpx;
-					}
-				}
-			}
-		}
-	}
+<template>
+	<view class="goodsList">
+		<view class="item" v-for="(item,index) in tempArr" :key='index' @click="goDetail(item)">
+			<view class="pictrue">
+				<span class="pictrue_log pictrue_log_class" v-if="item.activity && item.activity.type === '1'">秒杀</span>
+				<span class="pictrue_log pictrue_log_class" v-if="item.activity && item.activity.type === '2'">砍价</span>
+				<span class="pictrue_log pictrue_log_class" v-if="item.activity && item.activity.type === '3'">拼团</span>
+				<image :src="item.recommend_image" mode="" v-if="item.recommend_image"></image>
+				<image :src="item.image" mode="" v-else></image>
+			</view>
+			<view class="text line2">{{item.store_name}}</view>
+			<view class="bottom acea-row row-between-wrapper">
+				<view class="sales acea-row row-middle">
+					<view class="money font-color"><text>￥</text>{{item.price}}</view>
+					<view>已售 {{item.sales}}</view>
+				</view>
+				<view v-if="item.stock>0">
+					<view class="bnt"
+						v-if="(item.activity && (item.activity.type === '1' || item.activity.type === '2' || item.activity.type === '3') || item.is_virtual) || !item.cart_button">
+						立即购买</view>
+					<view v-else>
+						<!-- 多规格 -->
+						<view class="bnt" @click.stop="goCartDuo(item)" v-if="item.spec_type">
+							加入购物车
+							<view class="num" v-if="isLogin && item.cart_num">{{item.cart_num}}</view>
+						</view>
+						<!-- 单规格 -->
+						<view class="bnt" v-if="!item.spec_type && !item.cart_num" @click.stop="goCartDan(item,index)">
+							加入购物车</view>
+						<view class="cart acea-row row-middle" v-if="!item.spec_type && item.cart_num">
+							<view class="pictrue iconfont icon-jianhao" @click.stop="CartNumDes(index,item)"></view>
+							<view class="num">{{item.cart_num}}</view>
+							<view class="pictrue iconfont icon-jiahao" @click.stop="CartNumAdd(index,item)"></view>
+						</view>
+					</view>
+				</view>
+				<view class="bnt end" v-else>已售罄</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'd_goodList',
+		props: {
+			dataConfig: {
+				type: Object,
+				default: () => {}
+			},
+			tempArr: {
+				type: Array,
+				default: []
+			},
+			isLogin: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				addIng: false
+			};
+		},
+		created() {},
+		mounted() {},
+		methods: {
+			goDetail(item) {
+				this.$emit('detail', item);
+			},
+			goCartDuo(item) {
+				this.$emit('gocartduo', item);
+			},
+			goCartDan(item, index) {
+				this.$emit('gocartdan', item, index);
+			},
+			CartNumDes(index, item) {
+				if (this.addIng) return
+				this.addIng = true
+				this.$emit('ChangeCartNumDan', false, index, item);
+			},
+			CartNumAdd(index, item) {
+				if (this.addIng) return
+				this.addIng = true
+				this.$emit('ChangeCartNumDan', true, index, item);
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.goodsList {
+		padding: 0 30rpx;
+
+		.item {
+			width: 100%;
+			box-sizing: border-box;
+			margin-bottom: 63rpx;
+
+			.pictrue {
+				width: 100%;
+				height: 290rpx;
+				border-radius: 16rpx;
+				position: relative;
+
+				image {
+					width: 100%;
+					height: 100%;
+					border-radius: 10rpx;
+				}
+			}
+
+			.text {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #282828;
+				margin: 20rpx 0;
+			}
+
+			.bottom {
+				.sales {
+					font-size: 22rpx;
+					color: #8E8E8E;
+
+					.money {
+						font-size: 42rpx;
+						font-weight: bold;
+						margin-right: 18rpx;
+
+						text {
+							font-size: 28rpx;
+						}
+					}
+				}
+
+				.cart {
+					height: 56rpx;
+
+					.pictrue {
+						color: var(--view-theme);
+						font-size: 46rpx;
+						width: 50rpx;
+						height: 50rpx;
+						text-align: center;
+						line-height: 50rpx;
+					}
+
+					.num {
+						font-size: 30rpx;
+						color: #282828;
+						font-weight: bold;
+						width: 80rpx;
+						text-align: center;
+					}
+				}
+
+				.bnt {
+					padding: 0 30rpx;
+					height: 56rpx;
+					line-height: 56rpx;
+					background: var(--view-theme);
+					border-radius: 42rpx;
+					font-size: 26rpx;
+					color: #fff;
+					position: relative;
+
+					&.end {
+						background: rgba(203, 203, 203, 1);
+					}
+
+					.num {
+						background-color: var(--view-priceColor);
+						min-width: 12rpx;
+						color: #fff;
+						border-radius: 15px;
+						position: absolute;
+						right: -14rpx;
+						top: -15rpx;
+						font-size: 22rpx;
+						padding: 0 10rpx;
+						height: 34rpx;
+						line-height: 34rpx;
+					}
+				}
+			}
+		}
+	}
 </style>
diff --git a/template/uni-app/components/goodClass/index.vue b/template/uni-app/components/goodClass/index.vue
index ceb4d534e..7a6d0f8e8 100644
--- a/template/uni-app/components/goodClass/index.vue
+++ b/template/uni-app/components/goodClass/index.vue
@@ -1,199 +1,231 @@
-<template>
-	<view class="goodsList">
-		<view class="item acea-row row-between-wrapper" v-for="(item,index) in tempArr" :key='index' @click="goDetail(item)">
-			<view class="pictrue">
-				<span class="pictrue_log pictrue_log_class" v-if="item.activity && item.activity.type === '1'">秒杀</span>
-				<span class="pictrue_log pictrue_log_class" v-if="item.activity && item.activity.type === '2'">砍价</span>
-				<span class="pictrue_log pictrue_log_class" v-if="item.activity && item.activity.type === '3'">拼团</span>
-				<image :src="item.image" mode=""></image>
-			</view>
-			<view class="pictxt">
-				<view class="text line2">{{item.store_name}}</view>
-				<view class="bottom acea-row row-between-wrapper">
-					<view class="money font-color">
-						<text class="sign">￥</text>{{item.price}}
-						<!-- <span class="vip" v-if="item.vip_price">
-							<image src="../../static/images/vip01.png"></image>
-							¥{{item.vip_price}}
-						</span>
-						<text class="y_money" v-else>¥{{item.ot_price}}</text> -->
-					</view>
-					<view v-if="item.stock>0">
-					    <view class="iconfont icon-gouwuche6 acea-row row-center-wrapper" v-if="item.activity && (item.activity.type === '1' || item.activity.type === '2' || item.activity.type === '3')"></view>
-						<view v-else>
-							<!-- 多规格 -->
-							<view class="bnt acea-row row-center-wrapper" @click.stop="goCartDuo(item)" v-if="item.spec_type">
-								选规格
-								<text class="num" v-if="isLogin && item.cart_num">{{item.cart_num}}</text>
-							</view>
-							<!-- 单规格 -->
-							<view class="iconfont icon-gouwuche6 acea-row row-center-wrapper" v-if="!item.spec_type && !item.cart_num" @click.stop="goCartDan(item,index)"></view>
-							<view class="cart acea-row row-middle" v-if="!item.spec_type && item.cart_num">
-								<view class="pictrue iconfont icon-jianhao acea-row row-center-wrapper" @click.stop="CartNumDes(index,item)"></view>
-								<view class="num">{{item.cart_num}}</view>
-								<view class="pictrue iconfont icon-jiahao acea-row row-center-wrapper" @click.stop="CartNumAdd(index,item)"></view>
-							</view>
-						</view>
-					</view>
-					<view class="bnt acea-row row-center-wrapper end" v-else>已售罄</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'd_goodList',
-		props: {
-			dataConfig: {
-				type: Object,
-				default: () => {}
-			},
-			tempArr:{
-				type: Array,
-				default:[]
-			},
-			isLogin:{
-				type: Boolean,
-				default:false
-			}
-		},
-		data() {
-			return {
-			};
-		},
-		created() {},
-		mounted() {},
-		methods: {
-			goDetail(item){
-				this.$emit('detail',item);
-			},
-			goCartDuo(item){
-				this.$emit('gocartduo',item);
-			},
-			goCartDan(item,index){
-				this.$emit('gocartdan',item,index);
-			},
-			CartNumDes(index,item){
-				this.$emit('ChangeCartNumDan', false,index,item);
-			},
-			CartNumAdd(index,item){
-				this.$emit('ChangeCartNumDan', true,index,item);
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	.goodsList{
-		padding: 0 30rpx;
-		.item{
-			width: 100%;
-			box-sizing: border-box;
-			margin-bottom: 63rpx;
-			.pictrue{
-				width: 140rpx;
-				height: 140rpx;
-				border-radius: 10rpx;
-				position: relative;
-				border-radius: 22rpx;
-				image{
-					width: 100%;
-					height: 100%;
-					border-radius: 22rpx;
-				}
-			}
-			.pictxt{
-				width: 372rpx;
-				.text{
-					font-size:26rpx;
-					font-family:PingFang SC;
-					font-weight:500;
-					color: #333333;
-				}
-				.bottom{
-					margin-top: 22rpx;
-					.money{
-						font-size: 34rpx;
-						font-weight: 800;
-						.sign{
-							font-size: 24rpx;
-						}
-						.y_money{
-							font-size: 20rpx;
-							color: #999999;
-							margin-left: 14rpx;
-							font-weight: normal;
-							text-decoration: line-through;
-						}
-						.vip{
-							font-size: 22rpx;
-							color: #333333;
-							font-weight: normal;
-							margin-left: 14rpx;
-							image{
-								width: 38rpx;
-								height: 18rpx;
-								margin-right: 6rpx;
-							}
-						}
-					}
-					.cart{
-						height: 46rpx;
-						.pictrue{
-							color: var(--view-theme);
-							font-size:46rpx;
-							width: 46rpx;
-							height: 46rpx;
-							text-align: center;
-							line-height: 46rpx;
-							&.icon-jiahao{
-								 color: var(--view-theme);
-							}
-						}
-						.num{
-							font-size: 30rpx;
-							color: #333333;
-							font-weight: bold;
-							width: 60rpx;
-							text-align: center;
-						}
-					}
-					.icon-gouwuche6{
-						width: 46rpx;
-						height: 46rpx;
-						background-color: var(--view-theme);
-						border-radius: 50%;
-						color: #fff;
-						font-size: 30rpx;
-					}
-					.bnt{
-						padding: 0 20rpx;
-						height: 45rpx;
-						background:var(--view-theme);
-						border-radius:23rpx;
-						font-size: 22rpx;
-						color: #fff;
-						position: relative;
-						&.end{
-							background:#cccccc;
-						}
-						.num{
-							min-width: 14rpx;
-							background-color: #fff;
-							color: var(--view-theme);
-							border-radius: 15px;
-							position: absolute;
-							right: -13rpx;
-							top: -11rpx;
-							font-size: 16rpx;
-							padding: 0 10rpx;
-							border: 1px solid var(--view-theme);
-						}
-					}
-				}
-			}
-		}
-	}
+<template>
+	<view class="goodsList">
+		<view class="item acea-row row-between-wrapper" v-for="(item,index) in tempArr" :key='index'
+			@click="goDetail(item)">
+			<view class="pictrue">
+				<span class="pictrue_log pictrue_log_class" v-if="item.activity && item.activity.type === '1'">秒杀</span>
+				<span class="pictrue_log pictrue_log_class" v-if="item.activity && item.activity.type === '2'">砍价</span>
+				<span class="pictrue_log pictrue_log_class" v-if="item.activity && item.activity.type === '3'">拼团</span>
+				<image :src="item.image" mode=""></image>
+			</view>
+			<view class="pictxt">
+				<view class="text line2">{{item.store_name}}</view>
+				<view class="bottom acea-row row-between-wrapper">
+					<view class="money font-color">
+						<text class="sign">￥</text>{{item.price}}
+						<!-- <span class="vip" v-if="item.vip_price">
+							<image src="../../static/images/vip01.png"></image>
+							¥{{item.vip_price}}
+						</span>
+						<text class="y_money" v-else>¥{{item.ot_price}}</text> -->
+					</view>
+					<view v-if="item.stock>0">
+						<view class="iconfont icon-gouwuche6 acea-row row-center-wrapper"
+							v-if="item.activity && (item.activity.type === '1' || item.activity.type === '2' || item.activity.type === '3')">
+						</view>
+						<view v-else>
+							<!-- 多规格 -->
+							<view class="bnt acea-row row-center-wrapper" @click.stop="goCartDuo(item)"
+								v-if="item.spec_type">
+								选规格
+								<text class="num" v-if="isLogin && item.cart_num">{{item.cart_num}}</text>
+							</view>
+							<!-- 单规格 -->
+							<view class="iconfont icon-gouwuche6 acea-row row-center-wrapper"
+								v-if="!item.spec_type && !item.cart_num" @click.stop="goCartDan(item,index)"></view>
+							<view class="cart acea-row row-middle" v-if="!item.spec_type && item.cart_num">
+								<view class="pictrue iconfont icon-jianhao acea-row row-center-wrapper"
+									@click.stop="CartNumDes(index,item)"></view>
+								<view class="num">{{item.cart_num}}</view>
+								<view class="pictrue iconfont icon-jiahao acea-row row-center-wrapper"
+									@click.stop="CartNumAdd(index,item)"></view>
+							</view>
+						</view>
+					</view>
+					<view class="bnt acea-row row-center-wrapper end" v-else>已售罄</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'd_goodList',
+		props: {
+			dataConfig: {
+				type: Object,
+				default: () => {}
+			},
+			tempArr: {
+				type: Array,
+				default: []
+			},
+			isLogin: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				addIng: false
+			};
+		},
+		created() {},
+		mounted() {},
+		methods: {
+			goDetail(item) {
+				this.$emit('detail', item);
+			},
+			goCartDuo(item) {
+				this.$emit('gocartduo', item);
+			},
+			goCartDan(item, index) {
+				this.$emit('gocartdan', item, index);
+			},
+			CartNumDes(index, item) {
+				if (this.addIng) return
+				this.addIng = true
+				this.$emit('ChangeCartNumDan', false, index, item);
+			},
+			CartNumAdd(index, item) {
+				console.log('2')
+				if (this.addIng) return
+				this.addIng = true
+				this.$emit('ChangeCartNumDan', true, index, item);
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.goodsList {
+		padding: 0 30rpx;
+
+		.item {
+			width: 100%;
+			box-sizing: border-box;
+			margin-bottom: 63rpx;
+
+			.pictrue {
+				width: 140rpx;
+				height: 140rpx;
+				border-radius: 10rpx;
+				position: relative;
+				border-radius: 22rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+					border-radius: 22rpx;
+				}
+			}
+
+			.pictxt {
+				width: 372rpx;
+
+				.text {
+					font-size: 26rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+
+				.bottom {
+					margin-top: 22rpx;
+
+					.money {
+						font-size: 34rpx;
+						font-weight: 800;
+
+						.sign {
+							font-size: 24rpx;
+						}
+
+						.y_money {
+							font-size: 20rpx;
+							color: #999999;
+							margin-left: 14rpx;
+							font-weight: normal;
+							text-decoration: line-through;
+						}
+
+						.vip {
+							font-size: 22rpx;
+							color: #333333;
+							font-weight: normal;
+							margin-left: 14rpx;
+
+							image {
+								width: 38rpx;
+								height: 18rpx;
+								margin-right: 6rpx;
+							}
+						}
+					}
+
+					.cart {
+						height: 46rpx;
+
+						.pictrue {
+							color: var(--view-theme);
+							font-size: 46rpx;
+							width: 46rpx;
+							height: 46rpx;
+							text-align: center;
+							line-height: 46rpx;
+
+							&.icon-jiahao {
+								color: var(--view-theme);
+							}
+						}
+
+						.num {
+							font-size: 30rpx;
+							color: #333333;
+							font-weight: bold;
+							width: 60rpx;
+							text-align: center;
+						}
+					}
+
+					.icon-gouwuche6 {
+						width: 46rpx;
+						height: 46rpx;
+						background-color: var(--view-theme);
+						border-radius: 50%;
+						color: #fff;
+						font-size: 30rpx;
+					}
+
+					.bnt {
+						padding: 0 20rpx;
+						height: 45rpx;
+						background: var(--view-theme);
+						border-radius: 23rpx;
+						font-size: 22rpx;
+						color: #fff;
+						position: relative;
+
+						&.end {
+							background: #cccccc;
+						}
+
+						.num {
+							min-width: 14rpx;
+							background-color: #fff;
+							color: var(--view-theme);
+							border-radius: 15px;
+							position: absolute;
+							right: -13rpx;
+							top: -11rpx;
+							font-size: 16rpx;
+							padding: 0 10rpx;
+							border: 1px solid var(--view-theme);
+						}
+					}
+				}
+			}
+		}
+	}
 </style>
diff --git a/template/uni-app/libs/login.js b/template/uni-app/libs/login.js
index 8edba8861..b51454e45 100644
--- a/template/uni-app/libs/login.js
+++ b/template/uni-app/libs/login.js
@@ -75,14 +75,16 @@ function _toLogin(push, pathLogin) {
 		} else {
 			urlData += '?go_longin=1';
 		}
-		if (!Cache.has('snsapiKey')) {
-			auth.oAuth('snsapi_base', urlData);
-		} else {
-			uni.navigateTo({
-				url: '/pages/users/wechat_login/index',
-			});
-		}
-
+		// if (!Cache.has('snsapiKey')) {
+		// 	auth.oAuth('snsapi_base', urlData);
+		// } else {
+		// 	uni.navigateTo({
+		// 		url: '/pages/users/wechat_login/index',
+		// 	});
+		// }
+		uni.navigateTo({
+			url: '/pages/users/wechat_login/index',
+		});
 
 	} else {
 		uni.navigateTo({
@@ -92,19 +94,19 @@ function _toLogin(push, pathLogin) {
 	// #endif
 
 	// #ifdef MP 
-	// uni.navigateTo({
-	// 	url: '/pages/users/wechat_login/index'
-	// })
-	Routine.getCode()
-		.then(code => {
-			console.log(code)
-			Routine.silenceAuth(code).then(res => {
-				console.log(res)
-			})
-		})
-		.catch(err => {
-			uni.hideLoading();
-		});
+	uni.navigateTo({
+		url: '/pages/users/wechat_login/index'
+	})
+	// Routine.getCode()
+	// 	.then(code => {
+	// 		console.log(code)
+	// 		Routine.silenceAuth(code).then(res => {
+	// 			console.log(res)
+	// 		})
+	// 	})
+	// 	.catch(err => {
+	// 		uni.hideLoading();
+	// 	});
 	// #endif
 
 	// #ifdef APP-PLUS
diff --git a/template/uni-app/manifest.json b/template/uni-app/manifest.json
index 4e00d18d7..0f6bc8bed 100644
--- a/template/uni-app/manifest.json
+++ b/template/uni-app/manifest.json
@@ -50,7 +50,14 @@
                     "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
+                "permissionExternalStorage" : {
+                    "request" : "none",
+                    "prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
+                },
+                "permissionPhoneState" : {
+                    "request" : "none" //拨打电话权限关闭
+                }
             },
             /* ios打包配置 */
             "ios" : {
@@ -216,3 +223,5 @@
     },
     "_spaceID" : "679f0930-8f60-425c-9033-8c135f397ea5"
 }
+/* ios打包配置 */
+
diff --git a/template/uni-app/pages.json b/template/uni-app/pages.json
index 1b266aacd..13ce71627 100644
--- a/template/uni-app/pages.json
+++ b/template/uni-app/pages.json
@@ -961,7 +961,13 @@
 						// #endif
 					}
 				}
-			]
+			],
+			"plugins": {
+				"live-player-plugin": {
+					"version": "1.3.2",
+					"provider": "wx2b03c6e691cd7370"
+				}
+			}
 		},
 		{
 			"root": "pages/goods_details",
diff --git a/template/uni-app/pages/goods_cate/goods_cate.vue b/template/uni-app/pages/goods_cate/goods_cate.vue
index 0949ef3a0..6defd2411 100644
--- a/template/uni-app/pages/goods_cate/goods_cate.vue
+++ b/template/uni-app/pages/goods_cate/goods_cate.vue
@@ -1,108 +1,107 @@
-<template>
-	<view :style="colorStyle">
-		<goodsCate1 v-show="category==1" ref="classOne"></goodsCate1>
-		<goodsCate2 v-show="category==2" ref="classTwo" @jumpIndex="jumpIndex"></goodsCate2>
-		<goodsCate3 v-show="category==3" ref="classThree" @jumpIndex="jumpIndex"></goodsCate3>
-		<!-- <tabBar v-show="category == 1" :pagePath="'/pages/goods_cate/goods_cate'"></tabBar> -->
-	</view>
-</template>
-
-<script>
-	import colors from "@/mixins/color";
-	import goodsCate1 from './goods_cate1';
-	import goodsCate2 from './goods_cate2';
-	import goodsCate3 from './goods_cate3';
-	import {
-		colorChange
-	} from '@/api/api.js';
-	import {
-		mapGetters
-	} from 'vuex';
-	import tabBar from "@/pages/index/visualization/components/tabBar.vue"
-	export default {
-		computed: mapGetters(['isLogin', 'uid']),
-		components: {
-			goodsCate1,
-			goodsCate2,
-			goodsCate3,
-			tabBar
-		},
-		mixins: [colors],
-		data() {
-			return {
-				category: '',
-				is_diy: uni.getStorageSync('is_diy'),
-				status: 0,
-			}
-		},
-		onLoad() {
-			this.classStyle();
-		},
-		onReady() {
-
-		},
-		onShow() {
-			if (this.status == 2 || this.status == 3) {
-				uni.hideTabBar()
-			} else if (this.status == 1) {
-				if (!this.is_diy) {
-					uni.hideTabBar()
-				} else {
-					this.$refs.classOne.getNav();
-				}
-			}
-		},
-		methods: {
-			jumpIndex() {
-				if (this.is_diy) {
-					if (!uni.getStorageSync('FOOTER_BAR')) {
-						uni.showTabBar()
-					}
-				}
-			},
-			classStyle() {
-				colorChange('category').then(res => {
-					let status = res.data.status;
-					this.status = res.data.status
-					this.category = status
-					if (status == 2) {
-						if (this.isLogin) {
-							this.$refs.classTwo.getCartNum();
-							this.$refs.classTwo.getCartList(1);
-						}
-						this.$refs.classTwo.getAllCategory()
-					}
-					if (status == 3) {
-						if (this.isLogin) {
-							this.$refs.classThree.getCartNum();
-							this.$refs.classThree.getCartList(1);
-						}
-						this.$refs.classThree.getAllCategory()
-					}
-					if (status == 2 || status == 3) {
-						uni.hideTabBar()
-					} else {
-						if (!this.is_diy) {
-							uni.hideTabBar()
-						} else {
-							this.$refs.classOne.getNav();
-						}
-					}
-				})
-			}
-		},
-		onReachBottom: function() {
-			if (this.category == 2) {
-				this.$refs.classTwo.productslist();
-			}
-			if (this.category == 3) {
-				this.$refs.classThree.productslist();
-			}
-		}
-	}
-</script>
-<style scoped lang="scss">
-	/deep/.mask {
-		z-index: 99;
-	}
+<template>
+	<view :style="colorStyle">
+		<goodsCate1 v-show="category==1" ref="classOne"></goodsCate1>
+		<goodsCate2 v-show="category==2" ref="classTwo" @jumpIndex="jumpIndex"></goodsCate2>
+		<goodsCate3 v-show="category==3" ref="classThree" @jumpIndex="jumpIndex"></goodsCate3>
+	</view>
+</template>
+
+<script>
+	import colors from "@/mixins/color";
+	import goodsCate1 from './goods_cate1';
+	import goodsCate2 from './goods_cate2';
+	import goodsCate3 from './goods_cate3';
+	import {
+		colorChange
+	} from '@/api/api.js';
+	import {
+		mapGetters
+	} from 'vuex';
+	import tabBar from "@/pages/index/visualization/components/tabBar.vue"
+	export default {
+		computed: mapGetters(['isLogin', 'uid']),
+		components: {
+			goodsCate1,
+			goodsCate2,
+			goodsCate3,
+			tabBar
+		},
+		mixins: [colors],
+		data() {
+			return {
+				category: '',
+				is_diy: uni.getStorageSync('is_diy'),
+				status: 0,
+			}
+		},
+		onLoad() {
+			this.classStyle();
+		},
+		onReady() {
+
+		},
+		onShow() {
+			if (this.status == 2 || this.status == 3) {
+				uni.hideTabBar();
+			} else if (this.status == 1) {
+				if (!this.is_diy) {
+					uni.hideTabBar();
+				} else {
+					this.$refs.classOne.getNav();
+				}
+			}
+		},
+		methods: {
+			jumpIndex() {
+				if (this.is_diy) {
+					if (!uni.getStorageSync('FOOTER_BAR')) {
+						uni.showTabBar()
+					}
+				}
+			},
+			classStyle() {
+				colorChange('category').then(res => {
+					let status = res.data.status;
+					this.status = res.data.status
+					this.category = status
+					if (status == 2) {
+						if (this.isLogin) {
+							this.$refs.classTwo.getCartNum();
+							this.$refs.classTwo.getCartList(1);
+						}
+						this.$refs.classTwo.getAllCategory()
+					}
+					if (status == 3) {
+						if (this.isLogin) {
+							this.$refs.classThree.getCartNum();
+							this.$refs.classThree.getCartList(1);
+						}
+						this.$refs.classThree.getAllCategory()
+					}
+					if (status == 2 || status == 3) {
+						uni.hideTabBar()
+					} else {
+						if (!this.is_diy) {
+							uni.hideTabBar()
+						} else {
+							this.$refs.classOne.getNav();
+						}
+					}
+				})
+			}
+		},
+		onReachBottom: function() {
+			if (this.category == 2) {
+				this.$refs.classTwo.productslist();
+			}
+			if (this.category == 3) {
+				this.$refs.classThree.productslist();
+			}
+		}
+	}
+</script>
+<style scoped lang="scss">
+	/deep/.mask {
+		z-index: 99;
+	}
 </style>
diff --git a/template/uni-app/pages/goods_cate/goods_cate2.vue b/template/uni-app/pages/goods_cate/goods_cate2.vue
index df039f677..e8a01f441 100644
--- a/template/uni-app/pages/goods_cate/goods_cate2.vue
+++ b/template/uni-app/pages/goods_cate/goods_cate2.vue
@@ -1,1038 +1,1039 @@
-<template>
-	<view class="goodCate">
-		<!-- <view>
-			<scroll-view scroll-y="true" class="scroll-Y"> -->
-		<view class="header acea-row row-center-wrapper">
-			<navigator open-type="switchTab" url='/pages/index/index' class="pageIndex" hover-class="none"
-				@click="jumpIndex">
-				<text class="iconfont icon-shouye3"></text>
-			</navigator>
-			<navigator url="/pages/goods_search/index" class="search acea-row row-center-wrapper" hover-class="none">
-				<text class="iconfont icon-xiazai5"></text>
-				搜索商品
-			</navigator>
-		</view>
-		<view class="conter">
-			<view class='aside'>
-				<scroll-view scroll-y="true" scroll-with-animation='true' style="height: calc(100% - 100rpx)">
-					<view class='item acea-row row-center-wrapper' :class='index==navActive?"on":""'
-						v-for="(item,index) in categoryList" :key="index" @click="tapNav(index,item)">
-						<text>{{item.cate_name}}</text>
-					</view>
-				</scroll-view>
-
-			</view>
-			<view class="wrapper">
-				<view class="bgcolor" v-if="iSlong">
-					<view class="longTab acea-row row-middle">
-						<scroll-view scroll-x="true" style="white-space: nowrap; display: flex;height:44rpx;"
-							scroll-with-animation :scroll-left="tabLeft" show-scrollbar="true">
-							<view class="longItem" :style='"width:"+isWidth+"px"' :class="index===tabClick?'click':''"
-								v-for="(item,index) in categoryErList" :key="index" @click="longClick(index)">
-								{{item.cate_name}}
-							</view>
-						</scroll-view>
-					</view>
-					<view class="openList" @click="openTap"><text class="iconfont icon-xiala"></text></view>
-				</view>
-				<view v-else>
-					<view class="downTab">
-						<view class="title acea-row row-between-wrapper">
-							<view>{{categoryTitle}}</view>
-							<view class="closeList" @click="closeTap"><text class="iconfont icon-xiala"></text>
-							</view>
-						</view>
-						<view class="children">
-							<view class="acea-row row-middle">
-								<view class="item line1" :class="index===tabClick?'click':''"
-									v-for="(item,index) in categoryErList" :key="index" @click="longClick(index)">
-									{{item.cate_name}}
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="mask" @click="closeTap"></view>
-				</view>
-				<goodList :tempArr="tempArr" :isLogin="isLogin" @gocartduo="goCartDuo" @gocartdan="goCartDan"
-					@ChangeCartNumDan="ChangeCartNumDan" @detail="goDetail"></goodList>
-				<view class='loadingicon acea-row row-center-wrapper'>
-					<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
-				</view>
-			</view>
-		</view>
-		<view class="footer acea-row row-between-wrapper">
-			<view class="cartIcon acea-row row-center-wrapper" @click="getCartList(0)" v-if="cartData.cartList.length">
-				<view class="iconfont icon-gouwuche-yangshi2"></view>
-				<view class="num">{{cartCount}}</view>
-			</view>
-			<view class="cartIcon acea-row row-center-wrapper noCart" v-else>
-				<view class="iconfont icon-gouwuche-yangshi2"></view>
-			</view>
-			<view class="money acea-row row-middle">
-				<view>￥<text class="num">{{totalPrice}}</text></view>
-				<view class="bnt" @click="subOrder">去结算</view>
-			</view>
-		</view>
-		<cartList :cartData="cartData" @closeList="closeList" @ChangeCartNumDan="ChangeCartList"
-			@ChangeSubDel="ChangeSubDel" @ChangeOneDel="ChangeOneDel"></cartList>
-		<productWindow :attr="attr" :isShow='1' :iSplus='1' :iScart='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
-			@ChangeCartNum="ChangeCartNumDuo" @attrVal="attrVal" @iptCartNum="iptCartNum" @goCat="goCatNum"
-			id='product-window' :is_vip="is_vip"></productWindow>
-		<!-- </scroll-view>
-		</view> -->
-	</view>
-</template>
-
-<script>
-	import {
-		getCategoryList,
-		getProductslist,
-		getAttr,
-		postCartNum
-	} from '@/api/store.js';
-	import {
-		vcartList,
-		getCartCounts,
-		cartDel
-	} from '@/api/order.js';
-	import productWindow from '@/components/productWindow';
-	import goodList from '@/components/d_goodList';
-	import cartList from '@/components/cartList';
-	import {
-		mapGetters
-	} from 'vuex';
-	import {
-		goShopDetail
-	} from '@/libs/order.js';
-	import {
-		toLogin
-	} from '@/libs/login.js';
-	export default {
-		props: {},
-		computed: mapGetters(['isLogin', 'uid']),
-		components: {
-			productWindow,
-			goodList,
-			cartList
-		},
-		data() {
-			return {
-				categoryList: [],
-				navActive: 0,
-				categoryTitle: '',
-				categoryErList: [],
-				tabLeft: 0,
-				isWidth: 0, //每个导航栏占位
-				tabClick: 0, //导航栏被点击
-				iSlong: true,
-				tempArr: [],
-				loading: false,
-				loadend: false,
-				loadTitle: '加载更多',
-				page: 1,
-				limit: 10,
-				cid: 0, //一级分类
-				sid: 0, //二级分类
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false, //是否隐藏授权
-				attr: {
-					cartAttr: false,
-					productAttr: [],
-					productSelect: {}
-				},
-				productValue: [],
-				attrValue: '', //已选属性
-				storeName: '', //多属性产品名称
-				id: 0,
-				cartData: {
-					cartList: [],
-					iScart: false
-				},
-				cartCount: 0,
-				totalPrice: 0.00,
-				is_vip: 0, //是否是会员
-				cart_num: 0,
-				storeInfo: {}
-			}
-		},
-		// onShow(){
-		// 	if(this.isLogin){
-		// 		this.getCartNum();
-		// 		this.getCartList(1);
-		// 	}
-		// 	this.getAllCategory();
-		// },
-		mounted() {
-			// this.getAllCategory();
-			let that = this;
-			// 获取设备宽度
-			uni.getSystemInfo({
-				success(e) {
-					that.isWidth = e.windowWidth / 5
-				}
-			});
-		},
-		methods: {
-			jumpIndex() {
-				this.$emit('jumpIndex')
-			},
-			// 生成订单；
-			subOrder: function() {
-				let that = this,
-					list = that.cartData.cartList,
-					ids = [];
-				if (list.length) {
-					list.forEach(item => {
-						ids.push(item.id)
-					});
-					uni.navigateTo({
-						url: '/pages/users/order_confirm/index?cartId=' + ids.join(',')
-					});
-					that.cartData.iScart = false;
-				} else {
-					return that.$util.Tips({
-						title: '请选择产品'
-					});
-				}
-			},
-			// 计算总价；
-			getTotalPrice: function() {
-				let that = this,
-					list = that.cartData.cartList,
-					totalPrice = 0.00;
-				list.forEach(item => {
-					if (item.attrStatus && item.status) {
-						totalPrice = that.$util.$h.Add(totalPrice, that.$util.$h.Mul(item.cart_num, item
-							.truePrice));
-					}
-				})
-				that.$set(that, 'totalPrice', totalPrice);
-			},
-			ChangeSubDel: function(event) {
-				let that = this,
-					list = that.cartData.cartList,
-					ids = [];
-				list.forEach(item => {
-					ids.push(item.id)
-				});
-				cartDel(ids.join(",")).then(res => {
-					that.$set(that.cartData, 'cartList', []);
-					that.cartData.iScart = false;
-					that.totalPrice = 0.00;
-					that.page = 1;
-					that.loadend = false;
-					that.tempArr = [];
-					that.productslist();
-					that.getCartNum();
-				})
-			},
-			ChangeOneDel: function(id, index) {
-				let that = this,
-					list = that.cartData.cartList;
-				cartDel(id.toString()).then(res => {
-					list.splice(index, 1);
-					if (!list.length) {
-						that.cartData.iScart = false;
-						that.page = 1;
-						that.loadend = false;
-						that.tempArr = [];
-						that.productslist();
-					};
-					that.getCartNum();
-				})
-			},
-			getCartList(iSshow) {
-				let that = this;
-				vcartList().then(res => {
-					that.$set(that.cartData, 'cartList', res.data);
-					if (res.data.length) {
-						that.$set(that.cartData, 'iScart', iSshow ? false : !that.cartData.iScart);
-					} else {
-						that.$set(that.cartData, 'iScart', false);
-					}
-					that.getTotalPrice();
-				})
-			},
-			closeList(e) {
-				this.$set(this.cartData, 'iScart', e);
-				this.page = 1;
-				this.loadend = false;
-				this.tempArr = [];
-				this.productslist();
-			},
-			getCartNum: function() {
-				let that = this;
-				getCartCounts().then(res => {
-					that.cartCount = res.data.count;
-				});
-			},
-
-
-			onMyEvent: function() {
-				this.$set(this.attr, 'cartAttr', false);
-			},
-			/**
-			 * 默认选中属性
-			 * 
-			 */
-			DefaultSelect: function() {
-				let productAttr = this.attr.productAttr;
-				let value = [];
-				for (let key in this.productValue) {
-					if (this.productValue[key].stock > 0) {
-						value = this.attr.productAttr.length ? key.split(",") : [];
-						break;
-					}
-				}
-				for (let i = 0; i < productAttr.length; i++) {
-					this.$set(productAttr[i], "index", value[i]);
-				}
-				//sort();排序函数:数字-英文-汉字；
-				let productSelect = this.productValue[value.join(",")];
-				if (productSelect && productAttr.length) {
-					this.$set(
-						this.attr.productSelect,
-						"store_name",
-						this.storeName
-					);
-					this.$set(this.attr.productSelect, "image", productSelect.image);
-					this.$set(this.attr.productSelect, "price", productSelect.price);
-					this.$set(this.attr.productSelect, "stock", productSelect.stock);
-					this.$set(this.attr.productSelect, "unique", productSelect.unique);
-					this.$set(this.attr.productSelect, "cart_num", 1);
-					this.$set(this.attr.productSelect, 'vip_price', productSelect.vip_price);
-					this.$set(this, "attrValue", value.join(","));
-				} else if (!productSelect && productAttr.length) {
-					this.$set(
-						this.attr.productSelect,
-						"store_name",
-						this.storeName
-					);
-					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-					this.$set(this.attr.productSelect, "stock", 0);
-					this.$set(this.attr.productSelect, "unique", "");
-					this.$set(this.attr.productSelect, "cart_num", 0);
-					this.$set(this.attr.productSelect, 'vip_price', this.storeInfo.vip_price);
-					this.$set(this, "attrValue", "");
-				} else if (!productSelect && !productAttr.length) {
-					this.$set(
-						this.attr.productSelect,
-						"store_name",
-						this.storeName
-					);
-					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-					this.$set(this.attr.productSelect, "stock", this.storeInfo.stock);
-					this.$set(
-						this.attr.productSelect,
-						"unique",
-						this.storeInfo.unique || ""
-					);
-					this.$set(this.attr.productSelect, "cart_num", 1);
-					this.$set(this, "attrValue", "");
-					this.$set(this.attr.productSelect, 'vip_price', this.storeInfo.vip_price);
-				}
-			},
-			/**
-			 * 属性变动赋值
-			 * 
-			 */
-			ChangeAttr: function(res) {
-				let productSelect = this.productValue[res];
-				if (productSelect && productSelect.stock > 0) {
-					this.$set(this.attr.productSelect, "image", productSelect.image);
-					this.$set(this.attr.productSelect, "price", productSelect.price);
-					this.$set(this.attr.productSelect, "stock", productSelect.stock);
-					this.$set(this.attr.productSelect, "unique", productSelect.unique);
-					this.$set(this.attr.productSelect, 'vip_price', productSelect.vip_price);
-					this.$set(this.attr.productSelect, "cart_num", 1);
-					this.$set(this, "attrValue", res);
-				} else if (productSelect && productSelect.stock == 0) {
-					this.$set(this.attr.productSelect, "image", productSelect.image);
-					this.$set(this.attr.productSelect, "price", productSelect.price);
-					this.$set(this.attr.productSelect, "stock", 0);
-					this.$set(this.attr.productSelect, "unique", "");
-					this.$set(this.attr.productSelect, 'vip_price', productSelect.vip_price);
-					this.$set(this.attr.productSelect, "cart_num", 0);
-					this.$set(this, "attrValue", "");
-				} else {
-					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-					this.$set(this.attr.productSelect, "stock", 0);
-					this.$set(this.attr.productSelect, "unique", "");
-					this.$set(this.attr.productSelect, 'vip_price', this.storeInfo.vip_price);
-					this.$set(this.attr.productSelect, "cart_num", 0);
-					this.$set(this, "attrValue", "");
-				}
-			},
-			attrVal(val) {
-				this.$set(this.attr.productAttr[val.indexw], 'index', this.attr.productAttr[val.indexw].attr_values[val
-					.indexn]);
-			},
-			/**
-			 * 购物车手动填写
-			 * 
-			 */
-			iptCartNum: function(e) {
-				this.$set(this.attr.productSelect, 'cart_num', e);
-			},
-			onLoadFun() {},
-			// 产品列表
-			productslist: function() {
-				let that = this;
-				if (that.loadend) return;
-				if (that.loading) return;
-				that.loading = true;
-				that.loadTitle = '';
-				getProductslist({
-					page: that.page,
-					limit: that.limit,
-					type: 1,
-					cid: that.cid,
-					sid: that.sid
-				}).then(res => {
-					let list = res.data,
-						loadend = list.length < that.limit;
-					that.tempArr = that.$util.SplitArray(list, that.tempArr);
-					that.$set(that, 'tempArr', that.tempArr);
-					that.loading = false;
-					that.loadend = loadend;
-					that.loadTitle = loadend ? "人家是有底线的~" : "加载更多";
-					that.page = that.page + 1;
-				}).catch(err => {
-					that.loading = false,
-						that.loadTitle = '加载更多'
-				});
-			},
-
-			// 改变单属性购物车
-			ChangeCartNumDan(changeValue, index, item) {
-				let num = this.tempArr[index];
-				let stock = this.tempArr[index].stock;
-				this.ChangeCartNum(changeValue, num, stock, 0, item.id);
-			},
-			// 改变多属性购物车
-			ChangeCartNumDuo(changeValue) {
-				//获取当前变动属性
-				let productSelect = this.productValue[this.attrValue];
-				//如果没有属性,赋值给商品默认库存
-				if (productSelect === undefined && !this.attr.productAttr.length)
-					productSelect = this.attr.productSelect;
-				//无属性值即库存为0；不存在加减；
-				if (productSelect === undefined) return;
-				let stock = productSelect.stock || 0;
-				let num = this.attr.productSelect;
-				this.ChangeCartNum(changeValue, num, stock, 1, this.id);
-			},
-			// 已经加入购物车时的购物加减；
-			ChangeCartList(changeValue, index) {
-				let list = this.cartData.cartList;
-				let num = list[index];
-				let stock = list[index].trueStock;
-				this.ChangeCartNum(changeValue, num, stock, 0, num.product_id, index, 1);
-				if (!list.length) {
-					this.cartData.iScart = false;
-					this.page = 1;
-					this.loadend = false;
-					this.tempArr = [];
-					this.productslist();
-				}
-			},
-			// 购物车加减计算函数
-			ChangeCartNum(changeValue, num, stock, isDuo, id, index, cart) {
-				if (changeValue) {
-					num.cart_num++;
-					if (num.cart_num > stock) {
-						if (isDuo) {
-							this.$set(this.attr.productSelect, "cart_num", stock ? stock : 1);
-							this.$set(this, "cart_num", stock ? stock : 1);
-						} else {
-							num.cart_num = stock ? stock : 0;
-							this.$set(this, 'tempArr', this.tempArr);
-							this.$set(this.cartData, 'cartList', this.cartData.cartList);
-						}
-						return this.$util.Tips({
-							title: "该产品没有更多库存了"
-						});
-					} else {
-						if (!isDuo) {
-							if (cart) {
-								this.goCat(0, id, 1, 1, num.product_attr_unique);
-								this.getTotalPrice();
-							} else {
-								this.goCat(0, id, 1);
-							}
-						}
-					}
-				} else {
-					num.cart_num--;
-					if (num.cart_num == 0) {
-						this.cartData.cartList.splice(index, 1);
-					}
-					if (num.cart_num < 0) {
-						if (isDuo) {
-							this.$set(this.attr.productSelect, "cart_num", 1);
-							this.$set(this, "cart_num", 1);
-						} else {
-							num.cart_num = 0;
-							this.$set(this, 'tempArr', this.tempArr);
-							this.$set(this.cartData, 'cartList', this.cartData.cartList);
-						}
-					} else {
-						if (!isDuo) {
-							if (cart) {
-								this.goCat(0, id, 0, 1, num.product_attr_unique);
-								this.getTotalPrice();
-							} else {
-								this.goCat(0, id, 0);
-							}
-						}
-					}
-				}
-
-			},
-			// 多规格加入购物车；
-			goCatNum() {
-				this.goCat(1, this.id, 1);
-			},
-			/*
-			 * 加入购物车
-			 */
-			goCat: function(duo, id, type, cart, unique) {
-				let that = this;
-				if (duo) {
-					let productSelect = that.productValue[this.attrValue];
-					//如果有属性,没有选择,提示用户选择
-					if (
-						that.attr.productAttr.length &&
-						productSelect === undefined
-					)
-						return that.$util.Tips({
-							title: "产品库存不足，请选择其它属性"
-						});
-				}
-				let q = {
-					product_id: id,
-					num: duo ? that.attr.productSelect.cart_num : 1,
-					type: type,
-					unique: duo ? that.attr.productSelect.unique : cart ? unique : ""
-				};
-				postCartNum(q)
-					.then(function(res) {
-						if (duo) {
-							that.attr.cartAttr = false;
-							that.$util.Tips({
-								title: "添加购物车成功"
-							});
-							// that.page = 1;
-							// that.loadend = false;
-							that.tempArr.forEach((item, index) => {
-								if (item.id == that.id) {
-									let arrtStock = that.attr.productSelect.stock
-									let objNum = parseInt(item.cart_num) + parseInt(that.attr.productSelect
-										.cart_num);
-									item.cart_num = objNum > arrtStock ? arrtStock : objNum
-								}
-							})
-							// that.productslist();
-						}
-						that.getCartNum();
-						if (!cart) {
-							that.getCartList(1);
-						}
-					})
-					.catch(err => {
-						return that.$util.Tips({
-							title: err
-						});
-					});
-			},
-			// 点击默认单属性购物车
-			goCartDan(item, index) {
-				if (!this.isLogin) {
-					this.getIsLogin();
-				} else {
-					if (!item.cart_button) {
-						goShopDetail(item, this.uid).then(res => {
-							uni.navigateTo({
-								url: `/pages/goods_details/index?id=${item.id}`
-							});
-						});
-						return
-					}
-					this.tempArr[index].cart_num = 1;
-					this.$set(this, 'tempArr', this.tempArr);
-					this.goCat(0, item.id, 1);
-				}
-			},
-			goCartDuo(item) {
-				if (!this.isLogin) {
-					this.getIsLogin();
-				} else {
-					if (!item.cart_button) {
-						goShopDetail(item, this.uid).then(res => {
-							uni.navigateTo({
-								url: `/pages/goods_details/index?id=${item.id}`
-							});
-						});
-						return
-					}
-					uni.showLoading({
-						title: '加载中'
-					});
-					this.storeName = item.store_name;
-					this.getAttrs(item.id);
-					this.$set(this, 'id', item.id);
-					this.$set(this.attr, 'cartAttr', true);
-				}
-			},
-			getIsLogin() {
-				toLogin();
-			},
-			// 商品详情接口；
-			getAttrs(id) {
-				let that = this;
-				getAttr(id, 0).then(res => {
-					console.log(res.data)
-					uni.hideLoading();
-					that.$set(that.attr, 'productAttr', res.data.productAttr);
-					that.$set(that, 'productValue', res.data.productValue);
-					that.$set(that, 'is_vip', res.data.storeInfo.is_vip);
-					that.$set(that, 'storeInfo', res.data.storeInfo);
-					that.DefaultSelect();
-				})
-			},
-			// 去详情页
-			goDetail(item) {
-				if (!this.isLogin) {
-					toLogin();
-				} else {
-					goShopDetail(item, this.uid).then(res => {
-						uni.navigateTo({
-							url: `/pages/goods_details/index?id=${item.id}`
-						});
-					});
-				}
-			},
-
-
-			openTap() {
-				this.iSlong = false
-			},
-			closeTap() {
-				this.iSlong = true
-			},
-			getAllCategory: function() {
-				let that = this;
-				getCategoryList().then(res => {
-					let data = res.data;
-					data.forEach(item => {
-						item.children.unshift({
-							'id': 0,
-							'cate_name': '全部'
-						})
-					})
-					that.categoryTitle = data[0].cate_name;
-					that.cid = data[0].id;
-					that.sid = 0;
-					that.navActive = 0;
-					that.tabClick = 0;
-					that.categoryList = data;
-					that.categoryErList = res.data[0].children ? res.data[0].children : [];
-					that.page = 1;
-					that.loadend = false;
-					that.tempArr = [];
-					that.productslist();
-				})
-			},
-			tapNav(index, item) {
-				let list = this.categoryList[index];
-				this.navActive = index;
-				this.categoryTitle = list.cate_name;
-				this.categoryErList = item.children ? item.children : [];
-				this.tabClick = 0;
-				this.tabLeft = 0;
-				this.cid = list.id;
-				this.sid = 0;
-				this.page = 1;
-				this.loadend = false;
-				this.tempArr = [];
-				this.productslist();
-			},
-			// 导航栏点击
-			longClick(index) {
-				if (this.categoryErList.length > 3) {
-					this.tabLeft = (index - 1) * (this.isWidth + 6) //设置下划线位置
-				};
-				this.tabClick = index; //设置导航点击了哪一个
-				this.iSlong = true;
-				this.sid = this.categoryErList[index].id;
-				this.page = 1;
-				this.loadend = false;
-				this.tempArr = [];
-				this.productslist();
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-	.scroll-Y {
-		height: 100vh;
-	}
-
-	page {
-		background-color: #fff;
-	}
-
-	/deep/.product-window.joinCart {
-		z-index: 999;
-	}
-
-	::-webkit-scrollbar {
-		width: 0;
-		height: 0;
-		color: transparent;
-		display: none;
-	}
-
-	.goodCate {
-		.mask {
-			z-index: 99;
-		}
-
-		/deep/.attrProduct {
-			.mask {
-				z-index: 100;
-			}
-		}
-
-		.header {
-			position: fixed;
-			height: 128rpx;
-			background-color: #fff;
-			top: 0;
-			left: 0;
-			width: 100%;
-			z-index: 99;
-			border-bottom: 1px solid #F0F0F0;
-
-			.pageIndex {
-				width: 68rpx;
-				height: 68rpx;
-				border-radius: 50%;
-				background-color: var(--view-theme);
-				text-align: center;
-				line-height: 68rpx;
-
-				.iconfont {
-					color: #fff;
-					font-size: 30rpx;
-				}
-			}
-
-			.search {
-				width: 600rpx;
-				height: 68rpx;
-				border-radius: 36rpx;
-				background-color: #F8F8F8;
-				font-size: 26rpx;
-				color: #ADADAD;
-				margin-left: 22rpx;
-
-				.iconfont {
-					font-size: 30rpx;
-					margin: 4rpx 16rpx 0 0;
-				}
-			}
-		}
-
-		.conter {
-			margin-top: 128rpx;
-			height: 100vh;
-			background-color: #fff;
-
-			.aside {
-				position: fixed;
-				width: 23%;
-				left: 0;
-				bottom: 100rpx;
-				top: 0;
-				background-color: #f7f7f7;
-				overflow-y: auto;
-				overflow-x: hidden;
-				margin-top: 128rpx;
-				z-index: 99;
-
-				.item {
-					height: 100rpx;
-					width: 100%;
-					font-size: 26rpx;
-					color: #424242;
-
-					&.on {
-						background-color: #fff;
-						width: 100%;
-						text-align: center;
-						color: var(--view-theme);
-						font-weight: 500;
-						position: relative;
-
-						&::after {
-							content: "";
-							position: absolute;
-							width: 6rpx;
-							height: 46rpx;
-							background: var(--view-theme);
-							border-radius: 0 4rpx 4rpx 0;
-							left: 0
-						}
-					}
-				}
-			}
-
-			.wrapper {
-				margin-top: 104rpx;
-				width: 77%;
-				float: right;
-				background-color: #fff;
-				padding-bottom: 100rpx;
-
-				.bgcolor {
-					width: 100%;
-					background-color: #fff;
-				}
-
-				.goodsList {
-					margin-top: 0 !important;
-				}
-
-				.mask {
-					z-index: 9;
-				}
-
-				.longTab {
-					width: 65%;
-					position: fixed;
-					top: 0;
-					margin-top: 128rpx;
-					height: 100rpx;
-					z-index: 99;
-					background-color: #fff;
-
-					.longItem {
-						height: 44rpx;
-						display: inline-block;
-						line-height: 44rpx;
-						text-align: center;
-						font-size: 26rpx;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						white-space: nowrap;
-						color: #989898;
-						background-color: #F7F7F7;
-						border-radius: 22rpx;
-						margin-left: 12rpx;
-
-						&.click {
-							font-weight: bold;
-							background-color: var(--view-minorColorT);
-							color: var(--view-theme);
-						}
-					}
-
-					.underlineBox {
-						height: 3px;
-						width: 20%;
-						display: flex;
-						align-content: center;
-						justify-content: center;
-						transition: .5s;
-
-						.underline {
-							width: 33rpx;
-							height: 4rpx;
-							background-color: white;
-						}
-					}
-				}
-
-				.openList {
-					width: 12%;
-					height: 100rpx;
-					background-color: #fff;
-					line-height: 100rpx;
-					padding-left: 30rpx;
-					position: fixed;
-					right: 0;
-					top: 128rpx;
-					z-index: 99;
-
-					.iconfont {
-						font-size: 22rpx;
-						color: #989898;
-					}
-				}
-
-				.downTab {
-					width: 77%;
-					position: fixed;
-					top: 0;
-					margin-top: 128rpx;
-					z-index: 99;
-					background-color: #fff;
-					right: 0;
-
-					.title {
-						height: 100rpx;
-						font-size: 26rpx;
-						color: #ADADAD;
-						padding-left: 20rpx;
-
-						.closeList {
-							width: 90rpx;
-							height: 100%;
-							line-height: 100rpx;
-							padding-left: 30rpx;
-							transform: rotate(180deg);
-
-							.iconfont {
-								font-size: 22rpx;
-								color: #989898;
-							}
-						}
-					}
-
-					.children {
-						max-height: 500rpx;
-						overflow-x: hidden;
-						overflow-y: auto;
-						padding-bottom: 20rpx;
-
-						.item {
-							height: 60rpx;
-							background-color: #F7F7F7;
-							border-radius: 30rpx;
-							line-height: 60rpx;
-							padding: 0 15rpx;
-							margin: 0 0 20rpx 20rpx;
-							width: 165rpx;
-							text-align: center;
-
-							&.click {
-								font-weight: bold;
-								background-color: var(--view-minorColorT);
-								color: var(--view-theme);
-							}
-						}
-					}
-				}
-
-				.goodsList {
-					margin-top: 228rpx;
-					padding: 0 30rpx 0 20rpx;
-
-					/deep/.item {
-						margin-bottom: 33rpx !important;
-
-						.pictrue {
-							height: 216rpx;
-						}
-
-						.text {
-							font-size: 26rpx;
-						}
-
-						.bottom {
-							.sales {
-								.money {
-									font-size: 34rpx;
-
-									text {
-										font-size: 26rpx;
-									}
-								}
-							}
-
-							.cart {
-								.pictrue {
-									width: 50rpx;
-									height: 50rpx;
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
-		.footer {
-			position: fixed;
-			left: 0;
-			bottom: 0;
-			width: 100%;
-			background-color: #fff;
-			box-shadow: 0px -3rpx 16rpx rgba(36, 12, 12, 0.05);
-			z-index: 101;
-			padding: 0 30rpx;
+<template>
+	<view class="goodCate">
+		<!-- <view>
+			<scroll-view scroll-y="true" class="scroll-Y"> -->
+		<view class="header acea-row row-center-wrapper">
+			<navigator open-type="switchTab" url='/pages/index/index' class="pageIndex" hover-class="none"
+				@click="jumpIndex">
+				<text class="iconfont icon-shouye3"></text>
+			</navigator>
+			<navigator url="/pages/goods_search/index" class="search acea-row row-center-wrapper" hover-class="none">
+				<text class="iconfont icon-xiazai5"></text>
+				搜索商品
+			</navigator>
+		</view>
+		<view class="conter">
+			<view class='aside'>
+				<scroll-view scroll-y="true" scroll-with-animation='true' style="height: calc(100% - 100rpx)">
+					<view class='item acea-row row-center-wrapper' :class='index==navActive?"on":""'
+						v-for="(item,index) in categoryList" :key="index" @click="tapNav(index,item)">
+						<text>{{item.cate_name}}</text>
+					</view>
+				</scroll-view>
+
+			</view>
+			<view class="wrapper">
+				<view class="bgcolor" v-if="iSlong">
+					<view class="longTab acea-row row-middle">
+						<scroll-view scroll-x="true" style="white-space: nowrap; display: flex;height:44rpx;"
+							scroll-with-animation :scroll-left="tabLeft" show-scrollbar="true">
+							<view class="longItem" :style='"width:"+isWidth+"px"' :class="index===tabClick?'click':''"
+								v-for="(item,index) in categoryErList" :key="index" @click="longClick(index)">
+								{{item.cate_name}}
+							</view>
+						</scroll-view>
+					</view>
+					<view class="openList" @click="openTap"><text class="iconfont icon-xiala"></text></view>
+				</view>
+				<view v-else>
+					<view class="downTab">
+						<view class="title acea-row row-between-wrapper">
+							<view>{{categoryTitle}}</view>
+							<view class="closeList" @click="closeTap"><text class="iconfont icon-xiala"></text>
+							</view>
+						</view>
+						<view class="children">
+							<view class="acea-row row-middle">
+								<view class="item line1" :class="index===tabClick?'click':''"
+									v-for="(item,index) in categoryErList" :key="index" @click="longClick(index)">
+									{{item.cate_name}}
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="mask" @click="closeTap"></view>
+				</view>
+				<goodList ref="d_goodClass" :tempArr="tempArr" :isLogin="isLogin" @gocartduo="goCartDuo"
+					@gocartdan="goCartDan" @ChangeCartNumDan="ChangeCartNumDan" @detail="goDetail"></goodList>
+				<view class='loadingicon acea-row row-center-wrapper'>
+					<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+				</view>
+			</view>
+		</view>
+		<view class="footer acea-row row-between-wrapper">
+			<view class="cartIcon acea-row row-center-wrapper" @click="getCartList(0)" v-if="cartData.cartList.length">
+				<view class="iconfont icon-gouwuche-yangshi2"></view>
+				<view class="num">{{cartCount}}</view>
+			</view>
+			<view class="cartIcon acea-row row-center-wrapper noCart" v-else>
+				<view class="iconfont icon-gouwuche-yangshi2"></view>
+			</view>
+			<view class="money acea-row row-middle">
+				<view>￥<text class="num">{{totalPrice}}</text></view>
+				<view class="bnt" @click="subOrder">去结算</view>
+			</view>
+		</view>
+		<cartList :cartData="cartData" @closeList="closeList" @ChangeCartNumDan="ChangeCartList"
+			@ChangeSubDel="ChangeSubDel" @ChangeOneDel="ChangeOneDel"></cartList>
+		<productWindow :attr="attr" :isShow='1' :iSplus='1' :iScart='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
+			@ChangeCartNum="ChangeCartNumDuo" @attrVal="attrVal" @iptCartNum="iptCartNum" @goCat="goCatNum"
+			id='product-window' :is_vip="is_vip"></productWindow>
+		<!-- </scroll-view>
+		</view> -->
+	</view>
+</template>
+
+<script>
+	import {
+		getCategoryList,
+		getProductslist,
+		getAttr,
+		postCartNum
+	} from '@/api/store.js';
+	import {
+		vcartList,
+		getCartCounts,
+		cartDel
+	} from '@/api/order.js';
+	import productWindow from '@/components/productWindow';
+	import goodList from '@/components/d_goodList';
+	import cartList from '@/components/cartList';
+	import {
+		mapGetters
+	} from 'vuex';
+	import {
+		goShopDetail
+	} from '@/libs/order.js';
+	import {
+		toLogin
+	} from '@/libs/login.js';
+	export default {
+		props: {},
+		computed: mapGetters(['isLogin', 'uid']),
+		components: {
+			productWindow,
+			goodList,
+			cartList
+		},
+		data() {
+			return {
+				categoryList: [],
+				navActive: 0,
+				categoryTitle: '',
+				categoryErList: [],
+				tabLeft: 0,
+				isWidth: 0, //每个导航栏占位
+				tabClick: 0, //导航栏被点击
+				iSlong: true,
+				tempArr: [],
+				loading: false,
+				loadend: false,
+				loadTitle: '加载更多',
+				page: 1,
+				limit: 10,
+				cid: 0, //一级分类
+				sid: 0, //二级分类
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				attr: {
+					cartAttr: false,
+					productAttr: [],
+					productSelect: {}
+				},
+				productValue: [],
+				attrValue: '', //已选属性
+				storeName: '', //多属性产品名称
+				id: 0,
+				cartData: {
+					cartList: [],
+					iScart: false
+				},
+				cartCount: 0,
+				totalPrice: 0.00,
+				is_vip: 0, //是否是会员
+				cart_num: 0,
+				storeInfo: {}
+			}
+		},
+		// onShow(){
+		// 	if(this.isLogin){
+		// 		this.getCartNum();
+		// 		this.getCartList(1);
+		// 	}
+		// 	this.getAllCategory();
+		// },
+		mounted() {
+			// this.getAllCategory();
+			let that = this;
+			// 获取设备宽度
+			uni.getSystemInfo({
+				success(e) {
+					that.isWidth = e.windowWidth / 5
+				}
+			});
+		},
+		methods: {
+			jumpIndex() {
+				this.$emit('jumpIndex')
+			},
+			// 生成订单；
+			subOrder: function() {
+				let that = this,
+					list = that.cartData.cartList,
+					ids = [];
+				if (list.length) {
+					list.forEach(item => {
+						ids.push(item.id)
+					});
+					uni.navigateTo({
+						url: '/pages/users/order_confirm/index?cartId=' + ids.join(',')
+					});
+					that.cartData.iScart = false;
+				} else {
+					return that.$util.Tips({
+						title: '请选择产品'
+					});
+				}
+			},
+			// 计算总价；
+			getTotalPrice: function() {
+				let that = this,
+					list = that.cartData.cartList,
+					totalPrice = 0.00;
+				list.forEach(item => {
+					if (item.attrStatus && item.status) {
+						totalPrice = that.$util.$h.Add(totalPrice, that.$util.$h.Mul(item.cart_num, item
+							.truePrice));
+					}
+				})
+				that.$set(that, 'totalPrice', totalPrice);
+			},
+			ChangeSubDel: function(event) {
+				let that = this,
+					list = that.cartData.cartList,
+					ids = [];
+				list.forEach(item => {
+					ids.push(item.id)
+				});
+				cartDel(ids.join(",")).then(res => {
+					that.$set(that.cartData, 'cartList', []);
+					that.cartData.iScart = false;
+					that.totalPrice = 0.00;
+					that.page = 1;
+					that.loadend = false;
+					that.tempArr = [];
+					that.productslist();
+					that.getCartNum();
+				})
+			},
+			ChangeOneDel: function(id, index) {
+				let that = this,
+					list = that.cartData.cartList;
+				cartDel(id.toString()).then(res => {
+					list.splice(index, 1);
+					if (!list.length) {
+						that.cartData.iScart = false;
+						that.page = 1;
+						that.loadend = false;
+						that.tempArr = [];
+						that.productslist();
+					};
+					that.getCartNum();
+				})
+			},
+			getCartList(iSshow) {
+				let that = this;
+				vcartList().then(res => {
+					that.$set(that.cartData, 'cartList', res.data);
+					if (res.data.length) {
+						that.$set(that.cartData, 'iScart', iSshow ? false : !that.cartData.iScart);
+					} else {
+						that.$set(that.cartData, 'iScart', false);
+					}
+					that.getTotalPrice();
+				})
+			},
+			closeList(e) {
+				this.$set(this.cartData, 'iScart', e);
+				this.page = 1;
+				this.loadend = false;
+				this.tempArr = [];
+				this.productslist();
+			},
+			getCartNum: function() {
+				let that = this;
+				getCartCounts().then(res => {
+					that.cartCount = res.data.count;
+					that.$refs.d_goodClass.addIng = false
+				});
+			},
+
+
+			onMyEvent: function() {
+				this.$set(this.attr, 'cartAttr', false);
+			},
+			/**
+			 * 默认选中属性
+			 * 
+			 */
+			DefaultSelect: function() {
+				let productAttr = this.attr.productAttr;
+				let value = [];
+				for (let key in this.productValue) {
+					if (this.productValue[key].stock > 0) {
+						value = this.attr.productAttr.length ? key.split(",") : [];
+						break;
+					}
+				}
+				for (let i = 0; i < productAttr.length; i++) {
+					this.$set(productAttr[i], "index", value[i]);
+				}
+				//sort();排序函数:数字-英文-汉字；
+				let productSelect = this.productValue[value.join(",")];
+				if (productSelect && productAttr.length) {
+					this.$set(
+						this.attr.productSelect,
+						"store_name",
+						this.storeName
+					);
+					this.$set(this.attr.productSelect, "image", productSelect.image);
+					this.$set(this.attr.productSelect, "price", productSelect.price);
+					this.$set(this.attr.productSelect, "stock", productSelect.stock);
+					this.$set(this.attr.productSelect, "unique", productSelect.unique);
+					this.$set(this.attr.productSelect, "cart_num", 1);
+					this.$set(this.attr.productSelect, 'vip_price', productSelect.vip_price);
+					this.$set(this, "attrValue", value.join(","));
+				} else if (!productSelect && productAttr.length) {
+					this.$set(
+						this.attr.productSelect,
+						"store_name",
+						this.storeName
+					);
+					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
+					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
+					this.$set(this.attr.productSelect, "stock", 0);
+					this.$set(this.attr.productSelect, "unique", "");
+					this.$set(this.attr.productSelect, "cart_num", 0);
+					this.$set(this.attr.productSelect, 'vip_price', this.storeInfo.vip_price);
+					this.$set(this, "attrValue", "");
+				} else if (!productSelect && !productAttr.length) {
+					this.$set(
+						this.attr.productSelect,
+						"store_name",
+						this.storeName
+					);
+					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
+					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
+					this.$set(this.attr.productSelect, "stock", this.storeInfo.stock);
+					this.$set(
+						this.attr.productSelect,
+						"unique",
+						this.storeInfo.unique || ""
+					);
+					this.$set(this.attr.productSelect, "cart_num", 1);
+					this.$set(this, "attrValue", "");
+					this.$set(this.attr.productSelect, 'vip_price', this.storeInfo.vip_price);
+				}
+			},
+			/**
+			 * 属性变动赋值
+			 * 
+			 */
+			ChangeAttr: function(res) {
+				let productSelect = this.productValue[res];
+				if (productSelect && productSelect.stock > 0) {
+					this.$set(this.attr.productSelect, "image", productSelect.image);
+					this.$set(this.attr.productSelect, "price", productSelect.price);
+					this.$set(this.attr.productSelect, "stock", productSelect.stock);
+					this.$set(this.attr.productSelect, "unique", productSelect.unique);
+					this.$set(this.attr.productSelect, 'vip_price', productSelect.vip_price);
+					this.$set(this.attr.productSelect, "cart_num", 1);
+					this.$set(this, "attrValue", res);
+				} else if (productSelect && productSelect.stock == 0) {
+					this.$set(this.attr.productSelect, "image", productSelect.image);
+					this.$set(this.attr.productSelect, "price", productSelect.price);
+					this.$set(this.attr.productSelect, "stock", 0);
+					this.$set(this.attr.productSelect, "unique", "");
+					this.$set(this.attr.productSelect, 'vip_price', productSelect.vip_price);
+					this.$set(this.attr.productSelect, "cart_num", 0);
+					this.$set(this, "attrValue", "");
+				} else {
+					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
+					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
+					this.$set(this.attr.productSelect, "stock", 0);
+					this.$set(this.attr.productSelect, "unique", "");
+					this.$set(this.attr.productSelect, 'vip_price', this.storeInfo.vip_price);
+					this.$set(this.attr.productSelect, "cart_num", 0);
+					this.$set(this, "attrValue", "");
+				}
+			},
+			attrVal(val) {
+				this.$set(this.attr.productAttr[val.indexw], 'index', this.attr.productAttr[val.indexw].attr_values[val
+					.indexn]);
+			},
+			/**
+			 * 购物车手动填写
+			 * 
+			 */
+			iptCartNum: function(e) {
+				this.$set(this.attr.productSelect, 'cart_num', e);
+			},
+			onLoadFun() {},
+			// 产品列表
+			productslist: function() {
+				let that = this;
+				if (that.loadend) return;
+				if (that.loading) return;
+				that.loading = true;
+				that.loadTitle = '';
+				getProductslist({
+					page: that.page,
+					limit: that.limit,
+					type: 1,
+					cid: that.cid,
+					sid: that.sid
+				}).then(res => {
+					let list = res.data,
+						loadend = list.length < that.limit;
+					that.tempArr = that.$util.SplitArray(list, that.tempArr);
+					that.$set(that, 'tempArr', that.tempArr);
+					that.loading = false;
+					that.loadend = loadend;
+					that.loadTitle = loadend ? "人家是有底线的~" : "加载更多";
+					that.page = that.page + 1;
+				}).catch(err => {
+					that.loading = false,
+						that.loadTitle = '加载更多'
+				});
+			},
+
+			// 改变单属性购物车
+			ChangeCartNumDan(changeValue, index, item) {
+				let num = this.tempArr[index];
+				let stock = this.tempArr[index].stock;
+				this.ChangeCartNum(changeValue, num, stock, 0, item.id);
+			},
+			// 改变多属性购物车
+			ChangeCartNumDuo(changeValue) {
+				//获取当前变动属性
+				let productSelect = this.productValue[this.attrValue];
+				//如果没有属性,赋值给商品默认库存
+				if (productSelect === undefined && !this.attr.productAttr.length)
+					productSelect = this.attr.productSelect;
+				//无属性值即库存为0；不存在加减；
+				if (productSelect === undefined) return;
+				let stock = productSelect.stock || 0;
+				let num = this.attr.productSelect;
+				this.ChangeCartNum(changeValue, num, stock, 1, this.id);
+			},
+			// 已经加入购物车时的购物加减；
+			ChangeCartList(changeValue, index) {
+				let list = this.cartData.cartList;
+				let num = list[index];
+				let stock = list[index].trueStock;
+				this.ChangeCartNum(changeValue, num, stock, 0, num.product_id, index, 1);
+				if (!list.length) {
+					this.cartData.iScart = false;
+					this.page = 1;
+					this.loadend = false;
+					this.tempArr = [];
+					this.productslist();
+				}
+			},
+			// 购物车加减计算函数
+			ChangeCartNum(changeValue, num, stock, isDuo, id, index, cart) {
+				if (changeValue) {
+					num.cart_num++;
+					if (num.cart_num > stock) {
+						if (isDuo) {
+							this.$set(this.attr.productSelect, "cart_num", stock ? stock : 1);
+							this.$set(this, "cart_num", stock ? stock : 1);
+						} else {
+							num.cart_num = stock ? stock : 0;
+							this.$set(this, 'tempArr', this.tempArr);
+							this.$set(this.cartData, 'cartList', this.cartData.cartList);
+						}
+						return this.$util.Tips({
+							title: "该产品没有更多库存了"
+						});
+					} else {
+						if (!isDuo) {
+							if (cart) {
+								this.goCat(0, id, 1, 1, num.product_attr_unique);
+								this.getTotalPrice();
+							} else {
+								this.goCat(0, id, 1);
+							}
+						}
+					}
+				} else {
+					num.cart_num--;
+					if (num.cart_num == 0) {
+						this.cartData.cartList.splice(index, 1);
+					}
+					if (num.cart_num < 0) {
+						if (isDuo) {
+							this.$set(this.attr.productSelect, "cart_num", 1);
+							this.$set(this, "cart_num", 1);
+						} else {
+							num.cart_num = 0;
+							this.$set(this, 'tempArr', this.tempArr);
+							this.$set(this.cartData, 'cartList', this.cartData.cartList);
+						}
+					} else {
+						if (!isDuo) {
+							if (cart) {
+								this.goCat(0, id, 0, 1, num.product_attr_unique);
+								this.getTotalPrice();
+							} else {
+								this.goCat(0, id, 0);
+							}
+						}
+					}
+				}
+
+			},
+			// 多规格加入购物车；
+			goCatNum() {
+				this.goCat(1, this.id, 1);
+			},
+			/*
+			 * 加入购物车
+			 */
+			goCat: function(duo, id, type, cart, unique) {
+				let that = this;
+				if (duo) {
+					let productSelect = that.productValue[this.attrValue];
+					//如果有属性,没有选择,提示用户选择
+					if (
+						that.attr.productAttr.length &&
+						productSelect === undefined
+					)
+						return that.$util.Tips({
+							title: "产品库存不足，请选择其它属性"
+						});
+				}
+				let q = {
+					product_id: id,
+					num: duo ? that.attr.productSelect.cart_num : 1,
+					type: type,
+					unique: duo ? that.attr.productSelect.unique : cart ? unique : ""
+				};
+				postCartNum(q)
+					.then(function(res) {
+						if (duo) {
+							that.attr.cartAttr = false;
+							that.$util.Tips({
+								title: "添加购物车成功"
+							});
+							// that.page = 1;
+							// that.loadend = false;
+							that.tempArr.forEach((item, index) => {
+								if (item.id == that.id) {
+									let arrtStock = that.attr.productSelect.stock
+									let objNum = parseInt(item.cart_num) + parseInt(that.attr.productSelect
+										.cart_num);
+									item.cart_num = objNum > arrtStock ? arrtStock : objNum
+								}
+							})
+							// that.productslist();
+						}
+						that.getCartNum();
+						if (!cart) {
+							that.getCartList(1);
+						}
+					})
+					.catch(err => {
+						return that.$util.Tips({
+							title: err
+						});
+					});
+			},
+			// 点击默认单属性购物车
+			goCartDan(item, index) {
+				if (!this.isLogin) {
+					this.getIsLogin();
+				} else {
+					if (!item.cart_button) {
+						goShopDetail(item, this.uid).then(res => {
+							uni.navigateTo({
+								url: `/pages/goods_details/index?id=${item.id}`
+							});
+						});
+						return
+					}
+					this.tempArr[index].cart_num = 1;
+					this.$set(this, 'tempArr', this.tempArr);
+					this.goCat(0, item.id, 1);
+				}
+			},
+			goCartDuo(item) {
+				if (!this.isLogin) {
+					this.getIsLogin();
+				} else {
+					if (!item.cart_button) {
+						goShopDetail(item, this.uid).then(res => {
+							uni.navigateTo({
+								url: `/pages/goods_details/index?id=${item.id}`
+							});
+						});
+						return
+					}
+					uni.showLoading({
+						title: '加载中'
+					});
+					this.storeName = item.store_name;
+					this.getAttrs(item.id);
+					this.$set(this, 'id', item.id);
+					this.$set(this.attr, 'cartAttr', true);
+				}
+			},
+			getIsLogin() {
+				toLogin();
+			},
+			// 商品详情接口；
+			getAttrs(id) {
+				let that = this;
+				getAttr(id, 0).then(res => {
+					console.log(res.data)
+					uni.hideLoading();
+					that.$set(that.attr, 'productAttr', res.data.productAttr);
+					that.$set(that, 'productValue', res.data.productValue);
+					that.$set(that, 'is_vip', res.data.storeInfo.is_vip);
+					that.$set(that, 'storeInfo', res.data.storeInfo);
+					that.DefaultSelect();
+				})
+			},
+			// 去详情页
+			goDetail(item) {
+				if (!this.isLogin) {
+					toLogin();
+				} else {
+					goShopDetail(item, this.uid).then(res => {
+						uni.navigateTo({
+							url: `/pages/goods_details/index?id=${item.id}`
+						});
+					});
+				}
+			},
+
+
+			openTap() {
+				this.iSlong = false
+			},
+			closeTap() {
+				this.iSlong = true
+			},
+			getAllCategory: function() {
+				let that = this;
+				getCategoryList().then(res => {
+					let data = res.data;
+					data.forEach(item => {
+						item.children.unshift({
+							'id': 0,
+							'cate_name': '全部'
+						})
+					})
+					that.categoryTitle = data[0].cate_name;
+					that.cid = data[0].id;
+					that.sid = 0;
+					that.navActive = 0;
+					that.tabClick = 0;
+					that.categoryList = data;
+					that.categoryErList = res.data[0].children ? res.data[0].children : [];
+					that.page = 1;
+					that.loadend = false;
+					that.tempArr = [];
+					that.productslist();
+				})
+			},
+			tapNav(index, item) {
+				let list = this.categoryList[index];
+				this.navActive = index;
+				this.categoryTitle = list.cate_name;
+				this.categoryErList = item.children ? item.children : [];
+				this.tabClick = 0;
+				this.tabLeft = 0;
+				this.cid = list.id;
+				this.sid = 0;
+				this.page = 1;
+				this.loadend = false;
+				this.tempArr = [];
+				this.productslist();
+			},
+			// 导航栏点击
+			longClick(index) {
+				if (this.categoryErList.length > 3) {
+					this.tabLeft = (index - 1) * (this.isWidth + 6) //设置下划线位置
+				};
+				this.tabClick = index; //设置导航点击了哪一个
+				this.iSlong = true;
+				this.sid = this.categoryErList[index].id;
+				this.page = 1;
+				this.loadend = false;
+				this.tempArr = [];
+				this.productslist();
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.scroll-Y {
+		height: 100vh;
+	}
+
+	page {
+		background-color: #fff;
+	}
+
+	/deep/.product-window.joinCart {
+		z-index: 999;
+	}
+
+	::-webkit-scrollbar {
+		width: 0;
+		height: 0;
+		color: transparent;
+		display: none;
+	}
+
+	.goodCate {
+		.mask {
+			z-index: 99;
+		}
+
+		/deep/.attrProduct {
+			.mask {
+				z-index: 100;
+			}
+		}
+
+		.header {
+			position: fixed;
+			height: 128rpx;
+			background-color: #fff;
+			top: 0;
+			left: 0;
+			width: 100%;
+			z-index: 99;
+			border-bottom: 1px solid #F0F0F0;
+
+			.pageIndex {
+				width: 68rpx;
+				height: 68rpx;
+				border-radius: 50%;
+				background-color: var(--view-theme);
+				text-align: center;
+				line-height: 68rpx;
+
+				.iconfont {
+					color: #fff;
+					font-size: 30rpx;
+				}
+			}
+
+			.search {
+				width: 600rpx;
+				height: 68rpx;
+				border-radius: 36rpx;
+				background-color: #F8F8F8;
+				font-size: 26rpx;
+				color: #ADADAD;
+				margin-left: 22rpx;
+
+				.iconfont {
+					font-size: 30rpx;
+					margin: 4rpx 16rpx 0 0;
+				}
+			}
+		}
+
+		.conter {
+			margin-top: 128rpx;
+			height: 100vh;
+			background-color: #fff;
+
+			.aside {
+				position: fixed;
+				width: 23%;
+				left: 0;
+				bottom: 100rpx;
+				top: 0;
+				background-color: #f7f7f7;
+				overflow-y: auto;
+				overflow-x: hidden;
+				margin-top: 128rpx;
+				z-index: 99;
+
+				.item {
+					height: 100rpx;
+					width: 100%;
+					font-size: 26rpx;
+					color: #424242;
+
+					&.on {
+						background-color: #fff;
+						width: 100%;
+						text-align: center;
+						color: var(--view-theme);
+						font-weight: 500;
+						position: relative;
+
+						&::after {
+							content: "";
+							position: absolute;
+							width: 6rpx;
+							height: 46rpx;
+							background: var(--view-theme);
+							border-radius: 0 4rpx 4rpx 0;
+							left: 0
+						}
+					}
+				}
+			}
+
+			.wrapper {
+				margin-top: 104rpx;
+				width: 77%;
+				float: right;
+				background-color: #fff;
+				padding-bottom: 100rpx;
+
+				.bgcolor {
+					width: 100%;
+					background-color: #fff;
+				}
+
+				.goodsList {
+					margin-top: 0 !important;
+				}
+
+				.mask {
+					z-index: 9;
+				}
+
+				.longTab {
+					width: 65%;
+					position: fixed;
+					top: 0;
+					margin-top: 128rpx;
+					height: 100rpx;
+					z-index: 99;
+					background-color: #fff;
+
+					.longItem {
+						height: 44rpx;
+						display: inline-block;
+						line-height: 44rpx;
+						text-align: center;
+						font-size: 26rpx;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+						color: #989898;
+						background-color: #F7F7F7;
+						border-radius: 22rpx;
+						margin-left: 12rpx;
+
+						&.click {
+							font-weight: bold;
+							background-color: var(--view-minorColorT);
+							color: var(--view-theme);
+						}
+					}
+
+					.underlineBox {
+						height: 3px;
+						width: 20%;
+						display: flex;
+						align-content: center;
+						justify-content: center;
+						transition: .5s;
+
+						.underline {
+							width: 33rpx;
+							height: 4rpx;
+							background-color: white;
+						}
+					}
+				}
+
+				.openList {
+					width: 12%;
+					height: 100rpx;
+					background-color: #fff;
+					line-height: 100rpx;
+					padding-left: 30rpx;
+					position: fixed;
+					right: 0;
+					top: 128rpx;
+					z-index: 99;
+
+					.iconfont {
+						font-size: 22rpx;
+						color: #989898;
+					}
+				}
+
+				.downTab {
+					width: 77%;
+					position: fixed;
+					top: 0;
+					margin-top: 128rpx;
+					z-index: 99;
+					background-color: #fff;
+					right: 0;
+
+					.title {
+						height: 100rpx;
+						font-size: 26rpx;
+						color: #ADADAD;
+						padding-left: 20rpx;
+
+						.closeList {
+							width: 90rpx;
+							height: 100%;
+							line-height: 100rpx;
+							padding-left: 30rpx;
+							transform: rotate(180deg);
+
+							.iconfont {
+								font-size: 22rpx;
+								color: #989898;
+							}
+						}
+					}
+
+					.children {
+						max-height: 500rpx;
+						overflow-x: hidden;
+						overflow-y: auto;
+						padding-bottom: 20rpx;
+
+						.item {
+							height: 60rpx;
+							background-color: #F7F7F7;
+							border-radius: 30rpx;
+							line-height: 60rpx;
+							padding: 0 15rpx;
+							margin: 0 0 20rpx 20rpx;
+							width: 165rpx;
+							text-align: center;
+
+							&.click {
+								font-weight: bold;
+								background-color: var(--view-minorColorT);
+								color: var(--view-theme);
+							}
+						}
+					}
+				}
+
+				.goodsList {
+					margin-top: 228rpx;
+					padding: 0 30rpx 0 20rpx;
+
+					/deep/.item {
+						margin-bottom: 33rpx !important;
+
+						.pictrue {
+							height: 216rpx;
+						}
+
+						.text {
+							font-size: 26rpx;
+						}
+
+						.bottom {
+							.sales {
+								.money {
+									font-size: 34rpx;
+
+									text {
+										font-size: 26rpx;
+									}
+								}
+							}
+
+							.cart {
+								.pictrue {
+									width: 50rpx;
+									height: 50rpx;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		.footer {
+			position: fixed;
+			left: 0;
+			bottom: 0;
+			width: 100%;
+			background-color: #fff;
+			box-shadow: 0px -3rpx 16rpx rgba(36, 12, 12, 0.05);
+			z-index: 101;
+			padding: 0 30rpx;
 			box-sizing: border-box;
-			height: 100rpx;
-
-			.cartIcon {
-				width: 96rpx;
-				height: 96rpx;
-				border-radius: 50%;
-				position: relative;
-				margin-top: -36rpx;
-
-				.iconfont {
-					font-size: 115rpx;
-					margin-top: -5px;
-					color: var(--view-theme);
-				}
-
-				&.noCart {
-					.iconfont {
-						color: #CBCBCB;
-					}
-				}
-
-				.num {
-					background-color: var(--view-priceColor);
-					min-width: 12rpx;
-					color: #fff;
-					border-radius: 15px;
-					position: absolute;
-					right: -6rpx;
-					top: -10rpx;
-					font-size: 22rpx;
-					padding: 0 10rpx;
-					height: 34rpx;
-					line-height: 34rpx;
-				}
-			}
-
-			.money {
-				color: var(--view-priceColor);
-				font-size: 28rpx;
-				font-weight: bold;
-
-				.num {
-					font-size: 42rpx;
-				}
-
-				.bnt {
-					width: 222rpx;
-					height: 76rpx;
-					background: var(--view-theme);
-					border-radius: 46rpx;
-					line-height: 76rpx;
-					text-align: center;
-					color: #fff;
-					margin-left: 24rpx;
-				}
-			}
-		}
-	}
+			height: 100rpx;
+
+			.cartIcon {
+				width: 96rpx;
+				height: 96rpx;
+				border-radius: 50%;
+				position: relative;
+				margin-top: -36rpx;
+
+				.iconfont {
+					font-size: 115rpx;
+					margin-top: -5px;
+					color: var(--view-theme);
+				}
+
+				&.noCart {
+					.iconfont {
+						color: #CBCBCB;
+					}
+				}
+
+				.num {
+					background-color: var(--view-priceColor);
+					min-width: 12rpx;
+					color: #fff;
+					border-radius: 15px;
+					position: absolute;
+					right: -6rpx;
+					top: -10rpx;
+					font-size: 22rpx;
+					padding: 0 10rpx;
+					height: 34rpx;
+					line-height: 34rpx;
+				}
+			}
+
+			.money {
+				color: var(--view-priceColor);
+				font-size: 28rpx;
+				font-weight: bold;
+
+				.num {
+					font-size: 42rpx;
+				}
+
+				.bnt {
+					width: 222rpx;
+					height: 76rpx;
+					background: var(--view-theme);
+					border-radius: 46rpx;
+					line-height: 76rpx;
+					text-align: center;
+					color: #fff;
+					margin-left: 24rpx;
+				}
+			}
+		}
+	}
 </style>
diff --git a/template/uni-app/pages/goods_cate/goods_cate3.vue b/template/uni-app/pages/goods_cate/goods_cate3.vue
index ef190449d..b155b06e9 100644
--- a/template/uni-app/pages/goods_cate/goods_cate3.vue
+++ b/template/uni-app/pages/goods_cate/goods_cate3.vue
@@ -1,1089 +1,1092 @@
-<template>
-	<view class="goodCate">
-		<view class="header acea-row row-center-wrapper">
-			<navigator open-type="switchTab" url='/pages/index/index' @click="jumpIndex"
-				class="pageIndex acea-row row-center-wrapper" hover-class="none">
-				<text class="iconfont icon-fanhuishouye"></text>
-			</navigator>
-			<navigator url="/pages/goods_search/index" class="search acea-row row-middle" hover-class="none">
-				<text class="iconfont icon-sousuo5"></text>
-				搜索商品
-			</navigator>
-		</view>
-		<view class="conter">
-			<view class='aside'>
-				<scroll-view scroll-y="true" scroll-with-animation='true' style="height: calc(100% - 100rpx)">
-					<view class='item acea-row row-center-wrapper' :class='index==navActive?"on":""'
-						v-for="(item,index) in categoryList" :key="index" @click="tapNav(index,item)">
-						<text>{{item.cate_name}}</text>
-					</view>
-				</scroll-view>
-			</view>
-			<view class="wrapper">
-				<view class="bgcolor" v-if="iSlong">
-					<view class="longTab acea-row row-middle">
-						<scroll-view scroll-x="true" style="white-space: nowrap; display: flex;height:44rpx;"
-							scroll-with-animation :scroll-left="tabLeft" show-scrollbar="true">
-							<view class="longItem" :style='"width:"+isWidth+"px"' :class="index===tabClick?'click':''"
-								v-for="(item,index) in categoryErList" :key="index" @click="longClick(index)">
-								{{item.cate_name}}
-							</view>
-						</scroll-view>
-					</view>
-					<view class="openList" @click="openTap"><text class="iconfont icon-xiangxia"></text></view>
-				</view>
-				<view v-else>
-					<view class="downTab">
-						<view class="title acea-row row-between-wrapper">
-							<view>{{categoryTitle}}</view>
-							<view class="closeList" @click="closeTap"><text class="iconfont icon-xiangxia"></text>
-							</view>
-						</view>
-						<view class="children">
-							<view class="acea-row row-middle">
-								<view class="item line1" :class="index===tabClick?'click':''"
-									v-for="(item,index) in categoryErList" :key="index" @click="longClick(index)">
-									{{item.cate_name}}
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="mask" @click="closeTap"></view>
-				</view>
-				<goodClass :tempArr="tempArr" :isLogin="isLogin" @gocartduo="goCartDuo" @gocartdan="goCartDan"
-					@ChangeCartNumDan="ChangeCartNumDan" @detail="goDetail" :endLocation="endLocation"
-					@addCart="addCart"></goodClass>
-				<view class='loadingicon acea-row row-center-wrapper'>
-					<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
-				</view>
-			</view>
-		</view>
-		<view class="footer acea-row row-between-wrapper" id="cart">
-			<view class="cartIcon acea-row row-center-wrapper" @click="getCartList(0)" v-if="cartData.cartList.length">
-				<view class="iconfont icon-gouwuche-yangshi1"></view>
-				<view class="num">{{cartCount}}</view>
-			</view>
-			<view class="cartIcon acea-row row-center-wrapper noCart" v-else>
-				<view class="iconfont icon-gouwuche-yangshi1"></view>
-			</view>
-			<view class="acea-row row-middle">
-				<view class="money">￥<text class="num">{{totalPrice}}</text></view>
-				<view class="bnt" :class="cartCount?'':'on'" @click="subOrder">去结算</view>
-			</view>
-		</view>
-		<cartList :cartData="cartData" @closeList="closeList" @ChangeCartNumDan="ChangeCartList"
-			@ChangeSubDel="ChangeSubDel" @ChangeOneDel="ChangeOneDel"></cartList>
-		<productWindow :attr="attr" :isShow='1' :iSplus='1' :iScart='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
-			@ChangeCartNum="ChangeCartNumDuo" @attrVal="attrVal" @iptCartNum="iptCartNum" @goCat="goCatNum"
-			:is_vip="is_vip" id='product-window'></productWindow>
-		<ParabalaBall ref="Ball"></ParabalaBall>
-	</view>
-</template>
-
-<script>
-	import ParabalaBall from '@/components/parabolaBall/ParabolaBall.vue'
-	import {
-		getCategoryList,
-		getProductslist,
-		getAttr,
-		postCartNum
-	} from '@/api/store.js';
-	import {
-		vcartList,
-		getCartCounts,
-		cartDel
-	} from '@/api/order.js';
-	import productWindow from '@/components/productWindow';
-	import goodClass from '@/components/goodClass';
-	import cartList from '@/components/cartList';
-	import {
-		mapGetters
-	} from 'vuex';
-	import {
-		goShopDetail
-	} from '@/libs/order.js';
-	import {
-		toLogin
-	} from '@/libs/login.js';
-	export default {
-		computed: mapGetters(['isLogin', 'uid']),
-		components: {
-			productWindow,
-			goodClass,
-			cartList,
-			ParabalaBall
-		},
-		props: {},
-		data() {
-			return {
-				categoryList: [],
-				navActive: 0,
-				categoryTitle: '',
-				categoryErList: [],
-				tabLeft: 0,
-				isWidth: 0, //每个导航栏占位
-				tabClick: 0, //导航栏被点击
-				iSlong: true,
-				tempArr: [],
-				loading: false,
-				loadend: false,
-				loadTitle: '加载更多',
-				page: 1,
-				limit: 10,
-				cid: 0, //一级分类
-				sid: 0, //二级分类
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false, //是否隐藏授权
-				attr: {
-					cartAttr: false,
-					productAttr: [],
-					productSelect: {}
-				},
-				productValue: [],
-				attrValue: '', //已选属性
-				storeName: '', //多属性产品名称
-				id: 0,
-				cartData: {
-					cartList: [],
-					iScart: false
-				},
-				cartCount: 0,
-				totalPrice: 0.00,
-				lengthCart: 0,
-				is_vip: 0, //是否是会员
-				cart_num: 0,
-				storeInfo: {},
-				endLocation: {}
-			}
-		},
-		onShow() {
-			// if (this.isLogin) {
-			// 	this.getCartNum();
-			// 	this.getCartList(1);
-			// }
-		},
-		onLoad() {
-			console.log('aaaa')
-			this.$nextTick(() => {
-				uni.createSelectorQuery().select('#cart').boundingClientRect(res => {
-					const {
-						windowTop
-					} = uni.getSystemInfoSync()
-					this.endLocation = {
-						x: res.left + uni.upx2px(120) / 2,
-						// #ifdef H5
-						y: res.top + windowTop,
-						// #endif
-						// #ifndef H5
-						y: res.top,
-						// #endif
-					}
-				}).exec()
-			})
-		},
-		mounted() {
-			let that = this;
-			that.lengthCart = that.cartData.cartList;
-			// 获取设备宽度
-			uni.getSystemInfo({
-				success(e) {
-					that.isWidth = e.windowWidth / 5
-				}
-			});
-			// this.getAllCategory();
-		},
-		methods: {
-			jumpIndex() {
-				this.$emit('jumpIndex')
-			},
-			addCart(detail) {
-				// #ifdef H5
-				const {
-					windowTop
-				} = uni.getSystemInfoSync()
-				detail.y += windowTop
-				// #endif
-				// this.$refs.Ball.showBall({
-				// 	start: detail,
-				// 	src: [detail.img, ''][Math.round(Math.random())],
-				// 	end: this.endLocation
-				// }).then(() => {})
-			},
-			// 生成订单；
-			subOrder: function() {
-				let that = this,
-					list = that.cartData.cartList,
-					ids = [];
-				if (list.length) {
-					list.forEach(item => {
-						ids.push(item.id)
-					});
-					uni.navigateTo({
-						url: '/pages/users/order_confirm/index?cartId=' + ids.join(',')
-					});
-					that.cartData.iScart = false;
-				} else {
-					return that.$util.Tips({
-						title: '请选择产品'
-					});
-				}
-			},
-			// 计算总价；
-			getTotalPrice: function() {
-				let that = this,
-					list = that.cartData.cartList,
-					totalPrice = 0.00;
-				list.forEach(item => {
-					if (item.attrStatus && item.status) {
-						totalPrice = that.$util.$h.Add(totalPrice, that.$util.$h.Mul(item.cart_num, item
-							.truePrice));
-					}
-				})
-				that.$set(that, 'totalPrice', totalPrice);
-			},
-			ChangeSubDel: function(event) {
-				let that = this,
-					list = that.cartData.cartList,
-					ids = [];
-				list.forEach(item => {
-					ids.push(item.id)
-				});
-				cartDel(ids.join(",")).then(res => {
-					that.$set(that.cartData, 'cartList', []);
-					that.cartData.iScart = false;
-					that.totalPrice = 0.00;
-					that.page = 1;
-					that.loadend = false;
-					that.tempArr = [];
-					that.productslist();
-					that.getCartNum();
-				})
-			},
-			ChangeOneDel: function(id, index) {
-				let that = this,
-					list = that.cartData.cartList;
-				cartDel(id.toString()).then(res => {
-					list.splice(index, 1);
-					if (!list.length) {
-						that.cartData.iScart = false;
-						that.page = 1;
-						that.loadend = false;
-						that.tempArr = [];
-						that.productslist();
-					};
-					that.getCartNum();
-				})
-			},
-			getCartList(iSshow) {
-				let that = this;
-				vcartList().then(res => {
-					that.$set(that.cartData, 'cartList', res.data);
-					if (res.data.length) {
-						that.$set(that.cartData, 'iScart', iSshow ? false : !that.cartData.iScart);
-					} else {
-						that.$set(that.cartData, 'iScart', false);
-					}
-					that.getTotalPrice();
-				})
-			},
-			closeList(e) {
-				this.$set(this.cartData, 'iScart', e);
-				this.page = 1;
-				this.loadend = false;
-				this.tempArr = [];
-				this.productslist();
-			},
-			getCartNum: function() {
-				let that = this;
-				getCartCounts().then(res => {
-					that.cartCount = res.data.count;
-				});
-			},
-
-
-			onMyEvent: function() {
-				this.$set(this.attr, 'cartAttr', false);
-			},
-			/**
-			 * 默认选中属性
-			 * 
-			 */
-			DefaultSelect: function() {
-				let productAttr = this.attr.productAttr;
-				let value = [];
-				for (let key in this.productValue) {
-					if (this.productValue[key].stock > 0) {
-						value = this.attr.productAttr.length ? key.split(",") : [];
-						break;
-					}
-				}
-				for (let i = 0; i < productAttr.length; i++) {
-					this.$set(productAttr[i], "index", value[i]);
-				}
-				//sort();排序函数:数字-英文-汉字；
-				let productSelect = this.productValue[value.join(",")];
-				if (productSelect && productAttr.length) {
-					this.$set(
-						this.attr.productSelect,
-						"store_name",
-						this.storeName
-					);
-					this.$set(this.attr.productSelect, "image", productSelect.image);
-					this.$set(this.attr.productSelect, "price", productSelect.price);
-					this.$set(this.attr.productSelect, "stock", productSelect.stock);
-					this.$set(this.attr.productSelect, "unique", productSelect.unique);
-					this.$set(this.attr.productSelect, "cart_num", 1);
-					this.$set(this.attr.productSelect, 'vip_price', productSelect.vip_price);
-					this.$set(this, "attrValue", value.join(","));
-				} else if (!productSelect && productAttr.length) {
-					this.$set(
-						this.attr.productSelect,
-						"store_name",
-						this.storeName
-					);
-					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-					this.$set(this.attr.productSelect, "stock", 0);
-					this.$set(this.attr.productSelect, "unique", "");
-					this.$set(this.attr.productSelect, "cart_num", 0);
-					this.$set(this, "attrValue", "");
-					this.$set(this.attr.productSelect, 'vip_price', this.storeInfo.vip_price);
-				} else if (!productSelect && !productAttr.length) {
-					this.$set(
-						this.attr.productSelect,
-						"store_name",
-						this.storeName
-					);
-					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-					this.$set(this.attr.productSelect, "stock", this.storeInfo.stock);
-					this.$set(
-						this.attr.productSelect,
-						"unique",
-						this.storeInfo.unique || ""
-					);
-					this.$set(this.attr.productSelect, "cart_num", 1);
-					this.$set(this, "attrValue", "");
-					this.$set(this.attr.productSelect, 'vip_price', this.storeInfo.vip_price);
-				}
-			},
-			/**
-			 * 属性变动赋值
-			 * 
-			 */
-			ChangeAttr: function(res) {
-				let productSelect = this.productValue[res];
-				if (productSelect && productSelect.stock > 0) {
-					this.$set(this.attr.productSelect, "image", productSelect.image);
-					this.$set(this.attr.productSelect, "price", productSelect.price);
-					this.$set(this.attr.productSelect, "stock", productSelect.stock);
-					this.$set(this.attr.productSelect, "unique", productSelect.unique);
-					this.$set(this.attr.productSelect, 'vip_price', productSelect.vip_price);
-					this.$set(this.attr.productSelect, "cart_num", 1);
-					this.$set(this, "attrValue", res);
-				} else if (productSelect && productSelect.stock == 0) {
-					this.$set(this.attr.productSelect, "image", productSelect.image);
-					this.$set(this.attr.productSelect, "price", productSelect.price);
-					this.$set(this.attr.productSelect, "stock", 0);
-					this.$set(this.attr.productSelect, "unique", "");
-					this.$set(this.attr.productSelect, 'vip_price', productSelect.vip_price);
-					this.$set(this.attr.productSelect, "cart_num", 0);
-					this.$set(this, "attrValue", "");
-				} else {
-					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-					this.$set(this.attr.productSelect, "stock", 0);
-					this.$set(this.attr.productSelect, "unique", "");
-					this.$set(this.attr.productSelect, 'vip_price', this.storeInfo.vip_price);
-					this.$set(this.attr.productSelect, "cart_num", 0);
-					this.$set(this, "attrValue", "");
-				}
-			},
-			attrVal(val) {
-				this.$set(this.attr.productAttr[val.indexw], 'index', this.attr.productAttr[val.indexw].attr_values[val
-					.indexn]);
-			},
-			/**
-			 * 购物车手动填写
-			 * 
-			 */
-			iptCartNum: function(e) {
-				this.$set(this.attr.productSelect, 'cart_num', e);
-			},
-			onLoadFun() {},
-			// 产品列表
-			productslist: function() {
-				let that = this;
-				if (that.loadend) return;
-				if (that.loading) return;
-				that.loading = true;
-				that.loadTitle = '';
-				getProductslist({
-					page: that.page,
-					limit: that.limit,
-					type: 1,
-					cid: that.cid,
-					sid: that.sid
-				}).then(res => {
-					let list = res.data,
-						loadend = list.length < that.limit;
-					that.tempArr = that.$util.SplitArray(list, that.tempArr);
-					that.$set(that, 'tempArr', that.tempArr);
-					that.loading = false;
-					that.loadend = loadend;
-					that.loadTitle = loadend ? "人家是有底线的~" : "加载更多";
-					that.page = that.page + 1;
-				}).catch(err => {
-					that.loading = false,
-						that.loadTitle = '加载更多'
-				});
-			},
-
-			// 改变单属性购物车
-			ChangeCartNumDan(changeValue, index, item) {
-				let num = this.tempArr[index];
-				let stock = this.tempArr[index].stock;
-				this.ChangeCartNum(changeValue, num, stock, 0, item.id);
-			},
-			// 改变多属性购物车
-			ChangeCartNumDuo(changeValue) {
-				//获取当前变动属性
-				let productSelect = this.productValue[this.attrValue];
-				//如果没有属性,赋值给商品默认库存
-				if (productSelect === undefined && !this.attr.productAttr.length)
-					productSelect = this.attr.productSelect;
-				//无属性值即库存为0；不存在加减；
-				if (productSelect === undefined) return;
-				let stock = productSelect.stock || 0;
-				let num = this.attr.productSelect;
-				this.ChangeCartNum(changeValue, num, stock, 1, this.id);
-			},
-			// 已经加入购物车时的购物加减；
-			ChangeCartList(changeValue, index) {
-				let list = this.cartData.cartList;
-				let num = list[index];
-				let stock = list[index].trueStock;
-				this.ChangeCartNum(changeValue, num, stock, 0, num.product_id, index, 1);
-				if (!list.length) {
-					this.cartData.iScart = false;
-					this.page = 1;
-					this.loadend = false;
-					this.tempArr = [];
-					this.productslist();
-				}
-			},
-			// 购物车加减计算函数
-			ChangeCartNum(changeValue, num, stock, isDuo, id, index, cart) {
-				if (changeValue) {
-					num.cart_num++;
-					if (num.cart_num > stock) {
-						if (isDuo) {
-							this.$set(this.attr.productSelect, "cart_num", stock ? stock : 1);
-							this.$set(this, "cart_num", stock ? stock : 1);
-						} else {
-							num.cart_num = stock ? stock : 0;
-							this.$set(this, 'tempArr', this.tempArr);
-							this.$set(this.cartData, 'cartList', this.cartData.cartList);
-						}
-						return this.$util.Tips({
-							title: "该产品没有更多库存了"
-						});
-					} else {
-						if (!isDuo) {
-							if (cart) {
-								this.goCat(0, id, 1, 1, num.product_attr_unique);
-								this.getTotalPrice();
-							} else {
-								this.goCat(0, id, 1);
-							}
-						}
-					}
-				} else {
-					num.cart_num--;
-					if (num.cart_num == 0) {
-						this.cartData.cartList.splice(index, 1);
-						if (isDuo) {
-							this.$set(this.attr.productSelect, "cart_num", 1);
-							this.$set(this, "cart_num", 1);
-						}
-					}
-					if (num.cart_num < 0) {
-						if (isDuo) {
-							this.$set(this.attr.productSelect, "cart_num", 1);
-							this.$set(this, "cart_num", 1);
-						} else {
-							num.cart_num = 0;
-							this.$set(this, 'tempArr', this.tempArr);
-							this.$set(this.cartData, 'cartList', this.cartData.cartList);
-						}
-					} else {
-						if (!isDuo) {
-							if (cart) {
-								this.goCat(0, id, 0, 1, num.product_attr_unique);
-								this.getTotalPrice();
-							} else {
-								this.goCat(0, id, 0);
-							}
-						}
-					}
-				}
-
-			},
-			// 多规格加入购物车；
-			goCatNum() {
-				this.goCat(1, this.id, 1);
-			},
-			/*
-			 * 加入购物车
-			 */
-			goCat: function(duo, id, type, cart, unique) {
-				let that = this;
-				if (duo) {
-					let productSelect = that.productValue[this.attrValue];
-					//如果有属性,没有选择,提示用户选择
-					if (
-						that.attr.productAttr.length &&
-						productSelect === undefined
-					)
-						return that.$util.Tips({
-							title: "产品库存不足，请选择其它属性"
-						});
-				}
-				let q = {
-					product_id: id,
-					num: duo ? that.attr.productSelect.cart_num : 1,
-					type: type,
-					unique: duo ? that.attr.productSelect.unique : cart ? unique : ""
-				};
-				postCartNum(q)
-					.then(function(res) {
-						if (duo) {
-							that.attr.cartAttr = false;
-							that.$util.Tips({
-								title: "添加购物车成功"
-							});
-							// that.page = 1;
-							// that.loadend = false;
-							that.tempArr.forEach((item, index) => {
-								if (item.id == that.id) {
-									let arrtStock = that.attr.productSelect.stock
-									let objNum = parseInt(item.cart_num) + parseInt(that.attr.productSelect
-										.cart_num);
-									item.cart_num = objNum > arrtStock ? arrtStock : objNum
-								}
-							})
-							// that.productslist();
-						}
-						that.getCartNum();
-						if (!cart) {
-							that.getCartList(1);
-						}
-					})
-					.catch(err => {
-						return that.$util.Tips({
-							title: err
-						});
-					});
-			},
-			// 点击默认单属性购物车
-			goCartDan(item, index) {
-				if (!this.isLogin) {
-					this.getIsLogin();
-				} else {
-					if (!item.cart_button) {
-						goShopDetail(item, this.uid).then(res => {
-							uni.navigateTo({
-								url: `/pages/goods_details/index?id=${item.id}`
-							});
-						});
-						return
-					}
-					this.tempArr[index].cart_num = 1;
-					this.$set(this, 'tempArr', this.tempArr);
-					this.goCat(0, item.id, 1);
-				}
-			},
-			goCartDuo(item) {
-				if (!this.isLogin) {
-					this.getIsLogin();
-				} else {
-					if (!item.cart_button) {
-						goShopDetail(item, this.uid).then(res => {
-							uni.navigateTo({
-								url: `/pages/goods_details/index?id=${item.id}`
-							});
-						});
-						return
-					}
-					uni.showLoading({
-						title: '加载中'
-					});
-
-					this.storeName = item.store_name;
-					this.getAttrs(item.id);
-					this.$set(this, 'id', item.id);
-					this.$set(this.attr, 'cartAttr', true);
-				}
-			},
-			getIsLogin() {
-				toLogin();
-			},
-			// 商品详情接口；
-			getAttrs(id) {
-				let that = this;
-				getAttr(id, 0).then(res => {
-					uni.hideLoading();
-					that.$set(that.attr, 'productAttr', res.data.productAttr);
-					that.$set(that, 'productValue', res.data.productValue);
-					that.$set(that, 'is_vip', res.data.storeInfo.is_vip);
-					that.$set(that, 'storeInfo', res.data.storeInfo);
-					that.DefaultSelect();
-				})
-			},
-			// 去详情页
-			goDetail(item) {
-				if (!this.isLogin) {
-					toLogin();
-				} else {
-					goShopDetail(item, this.uid).then(res => {
-						uni.navigateTo({
-							url: `/pages/goods_details/index?id=${item.id}`
-						});
-					});
-				}
-			},
-
-
-			openTap() {
-				this.iSlong = false
-			},
-			closeTap() {
-				this.iSlong = true
-			},
-			getAllCategory: function() {
-				let that = this;
-				getCategoryList().then(res => {
-					let data = res.data;
-					data.forEach(item => {
-						item.children.unshift({
-							'id': 0,
-							'cate_name': '全部'
-						})
-					})
-					that.categoryTitle = data[0].cate_name;
-					that.cid = data[0].id;
-					that.sid = 0;
-					that.navActive = 0;
-					that.tabClick = 0;
-					that.categoryList = data;
-					that.categoryErList = res.data[0].children ? res.data[0].children : [];
-					that.page = 1;
-					that.loadend = false;
-					that.tempArr = [];
-					that.productslist();
-				})
-			},
-			tapNav(index, item) {
-				let list = this.categoryList[index];
-				this.navActive = index;
-				this.categoryTitle = list.cate_name;
-				this.categoryErList = item.children ? item.children : [];
-				this.tabClick = 0;
-				this.tabLeft = 0;
-				this.cid = list.id;
-				this.sid = 0;
-				this.page = 1;
-				this.loadend = false;
-				this.tempArr = [];
-				this.productslist();
-			},
-			// 导航栏点击
-			longClick(index) {
-				if (this.categoryErList.length > 3) {
-					this.tabLeft = (index - 1) * (this.isWidth + 6) //设置下划线位置
-				};
-				this.tabClick = index; //设置导航点击了哪一个
-				this.iSlong = true;
-				this.sid = this.categoryErList[index].id;
-				this.page = 1;
-				this.loadend = false;
-				this.tempArr = [];
-				this.productslist();
-			},
-		},
-		onReachBottom: function() {
-			this.productslist();
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		background-color: #fff;
-	}
-
-	/deep/.product-window.joinCart {
-		z-index: 999;
-	}
-
-	::-webkit-scrollbar {
-		width: 0;
-		height: 0;
-		color: transparent;
-		display: none;
-	}
-
-	.goodCate {
-		/deep/.mask {
-			z-index: 99;
-		}
-
-		/deep/.attrProduct {
-			.mask {
-				z-index: 100;
-			}
-		}
-
-		.header {
-			position: fixed;
-			height: 128rpx;
-			background-color: #fff;
-			top: 0;
-			left: 0;
-			width: 100%;
-			z-index: 99;
-			border-bottom: 1px solid #eee;
-			padding: 0 28rpx;
-
-			.pageIndex {
-				width: 68rpx;
-				height: 68rpx;
-				border-radius: 50%;
-				background-color: var(--view-theme);
-
-				.iconfont {
-					color: #fff;
-					font-size: 30rpx;
-				}
-
-				// image{
-				// 	width: 29rpx;
-				// 	height: 30rpx;
-				// }
-			}
-
-			.search {
-				width: 600rpx;
-				height: 68rpx;
-				border-radius: 36rpx;
-				background-color: #F7F7F7;
-				font-size: 26rpx;
-				color: #cccccc;
-				margin-left: 22rpx;
-				padding: 0 30rpx;
-				box-sizing: border-box;
-
-				.iconfont {
-					font-size: 30rpx;
-					margin-right: 18rpx;
-					color: #666666;
-				}
-
-				// image{
-				// 	width: 27rpx;
-				// 	height: 27rpx;
-				// 	margin-right: 18rpx;
-				// }
-			}
-		}
-
-		.conter {
-			margin-top: 128rpx;
-			height: 100vh;
-			background-color: #fff;
-
-			.aside {
-				position: fixed;
-				width: 23%;
-				left: 0;
-				bottom: 0;
-				top: 0;
-				background-color: #F7F7F7;
-				overflow-y: auto;
-				overflow-x: hidden;
-				margin-top: 128rpx;
-				z-index: 99;
-				padding-bottom: 140rpx;
-
-				.item {
-					height: 100rpx;
-					width: 100%;
-					font-size: 26rpx;
-					color: #333333;
-
-					&.on {
-						background-color: #FFFFFF;
-						width: 100%;
-						text-align: center;
-						color: var(--view-theme);
-						font-weight: 500;
-						position: relative;
-
-						&::after {
-							content: "";
-							position: absolute;
-							width: 6rpx;
-							height: 46rpx;
-							background: var(--view-theme);
-							border-radius: 0 4rpx 4rpx 0;
-							left: 0
-						}
-					}
-				}
-			}
-
-			.wrapper {
-				margin-top: 104rpx;
-				width: 77%;
-				float: right;
-				background-color: #FFFFFF;
-				padding-bottom: 130rpx;
-
-				.bgcolor {
-					width: 100%;
-					background-color: #FFFFFF;
-				}
-
-				.goodsList {
-					margin-top: 0 !important;
-				}
-
-				.mask {
-					z-index: 9;
-				}
-
-				.longTab {
-					width: 65%;
-					position: fixed;
-					top: 0;
-					margin-top: 128rpx;
-					height: 100rpx;
-					z-index: 99;
-					background-color: #FFFFFF;
-
-					.longItem {
-						height: 44rpx;
-						display: inline-block;
-						line-height: 44rpx;
-						text-align: center;
-						font-size: 26rpx;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						white-space: nowrap;
-						color: #333333;
-						background-color: #F7F7F7;
-						border-radius: 22rpx;
-						margin-left: 12rpx;
-
-						&.click {
-							font-weight: bold;
-							background-color: var(--view-theme);
-							color: #ffffff;
-						}
-					}
-
-					.underlineBox {
-						height: 3px;
-						width: 20%;
-						display: flex;
-						align-content: center;
-						justify-content: center;
-						transition: .5s;
-
-						.underline {
-							width: 33rpx;
-							height: 4rpx;
-							background-color: #FFFFFF;
-						}
-					}
-				}
-
-				.openList {
-					width: 12%;
-					height: 100rpx;
-					background-color: #FFFFFF;
-					line-height: 100rpx;
-					padding-left: 30rpx;
-					position: fixed;
-					right: 0;
-					top: 128rpx;
-					z-index: 99;
-
-					.iconfont {
-						font-size: 22rpx;
-						color: #666666;
-					}
-				}
-
-				.downTab {
-					width: 77%;
-					position: fixed;
-					top: 0;
-					margin-top: 128rpx;
-					z-index: 99;
-					background-color: #FFFFFF;
-					right: 0;
-
-					.title {
-						height: 100rpx;
-						font-size: 26rpx;
-						color: #999999;
-						padding-left: 20rpx;
-
-						.closeList {
-							width: 90rpx;
-							height: 100%;
-							line-height: 100rpx;
-							padding-left: 30rpx;
-							transform: rotate(180deg);
-
-							.iconfont {
-								font-size: 22rpx;
-								color: #666666;
-							}
-						}
-					}
-
-					.children {
-						max-height: 500rpx;
-						overflow-x: hidden;
-						overflow-y: auto;
-						padding-bottom: 20rpx;
-
-						.item {
-							height: 60rpx;
-							background-color: #F7F7F7;
-							border-radius: 30rpx;
-							line-height: 60rpx;
-							padding: 0 15rpx;
-							margin: 0 0 20rpx 20rpx;
-							width: 165rpx;
-							text-align: center;
-
-							&.click {
-								font-weight: bold;
-								background-color: var(--view-theme);
-								color: #ffffff;
-							}
-						}
-					}
-				}
-
-				.goodsList {
-					margin-top: 228rpx;
-					padding: 0 20rpx 0 20rpx;
-
-					/deep/.item {
-						margin-bottom: 33rpx !important;
-
-						// .pictrue {
-						// 	height: 216rpx;
-						// }
-
-						.text {
-							font-size: 26rpx;
-						}
-
-						.bottom {
-							padding-right: 18rpx;
-
-							.sales {
-								.money {
-									font-size: 34rpx;
-
-									text {
-										font-size: 26rpx;
-									}
-								}
-							}
-
-							.cart {
-								.pictrue {
-									width: 50rpx;
-									height: 50rpx;
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
-		.footer {
-			width: 100%;
-			position: fixed;
-			left: 0;
-			bottom: 0;
-			background-color: #fff;
-			box-shadow: 0px -3px 16px rgba(36, 12, 12, 0.05);
-			z-index: 101;
-			padding-left: 30rpx;
-			box-sizing: border-box;
-			height: 100rpx;
-
-			.cartIcon {
-				width: 124rpx;
-				height: 106rpx;
-				position: relative;
-				margin-top: -64rpx;
-
-				.iconfont {
-					font-size: 100rpx;
-					color: var(--view-theme);
-				}
-
-				.num {
-					min-width: 12rpx;
-					color: var(--view-theme);
-					border-radius: 15px;
-					position: absolute;
-					right: 0;
-					font-size: 16rpx;
-					padding: 0 11rpx;
-					background-color: #fff;
-					height: 36rpx;
-					line-height: 34rpx;
-					top: 24rpx;
-					border: 1rpx solid var(--view-theme)
-				}
-			}
-
-			.money {
-				font-size: 26rpx;
-				font-weight: bold;
-				color: var(--view-priceColor);
-				margin-right: 34rpx;
-
-				.num {
-					font-size: 34rpx;
-				}
-			}
-
-			.bnt {
-				width: 222rpx;
-				height: 76rpx;
-				background-color: var(--view-theme);
-				border-radius: 46px;
-				line-height: 76rpx;
-				text-align: center;
-				color: #fff;
-				font-size: 28rpx;
-				margin-right: 30rpx;
-
-				&.on {
-					background: #bbbbbb;
-				}
-			}
-		}
-	}
+<template>
+	<view class="goodCate">
+		<view class="header acea-row row-center-wrapper">
+			<navigator open-type="switchTab" url='/pages/index/index' @click="jumpIndex"
+				class="pageIndex acea-row row-center-wrapper" hover-class="none">
+				<text class="iconfont icon-fanhuishouye"></text>
+			</navigator>
+			<navigator url="/pages/goods_search/index" class="search acea-row row-middle" hover-class="none">
+				<text class="iconfont icon-sousuo5"></text>
+				搜索商品
+			</navigator>
+		</view>
+		<view class="conter">
+			<view class='aside'>
+				<scroll-view scroll-y="true" scroll-with-animation='true' style="height: calc(100% - 100rpx)">
+					<view class='item acea-row row-center-wrapper' :class='index==navActive?"on":""'
+						v-for="(item,index) in categoryList" :key="index" @click="tapNav(index,item)">
+						<text>{{item.cate_name}}</text>
+					</view>
+				</scroll-view>
+			</view>
+			<view class="wrapper">
+				<view class="bgcolor" v-if="iSlong">
+					<view class="longTab acea-row row-middle">
+						<scroll-view scroll-x="true" style="white-space: nowrap; display: flex;height:44rpx;"
+							scroll-with-animation :scroll-left="tabLeft" show-scrollbar="true">
+							<view class="longItem" :style='"width:"+isWidth+"px"' :class="index===tabClick?'click':''"
+								v-for="(item,index) in categoryErList" :key="index" @click="longClick(index)">
+								{{item.cate_name}}
+							</view>
+						</scroll-view>
+					</view>
+					<view class="openList" @click="openTap"><text class="iconfont icon-xiangxia"></text></view>
+				</view>
+				<view v-else>
+					<view class="downTab">
+						<view class="title acea-row row-between-wrapper">
+							<view>{{categoryTitle}}</view>
+							<view class="closeList" @click="closeTap"><text class="iconfont icon-xiangxia"></text>
+							</view>
+						</view>
+						<view class="children">
+							<view class="acea-row row-middle">
+								<view class="item line1" :class="index===tabClick?'click':''"
+									v-for="(item,index) in categoryErList" :key="index" @click="longClick(index)">
+									{{item.cate_name}}
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="mask" @click="closeTap"></view>
+				</view>
+				<goodClass ref="goodClass" :tempArr="tempArr" :isLogin="isLogin" @gocartduo="goCartDuo"
+					@gocartdan="goCartDan" @ChangeCartNumDan="ChangeCartNumDan" @detail="goDetail"
+					:endLocation="endLocation" @addCart="addCart"></goodClass>
+				<view class='loadingicon acea-row row-center-wrapper'>
+					<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+				</view>
+			</view>
+		</view>
+		<view class="footer acea-row row-between-wrapper" id="cart">
+			<view class="cartIcon acea-row row-center-wrapper" @click="getCartList(0)" v-if="cartData.cartList.length">
+				<view class="iconfont icon-gouwuche-yangshi1"></view>
+				<view class="num">{{cartCount}}</view>
+			</view>
+			<view class="cartIcon acea-row row-center-wrapper noCart" v-else>
+				<view class="iconfont icon-gouwuche-yangshi1"></view>
+			</view>
+			<view class="acea-row row-middle">
+				<view class="money">￥<text class="num">{{totalPrice}}</text></view>
+				<view class="bnt" :class="cartCount?'':'on'" @click="subOrder">去结算</view>
+			</view>
+		</view>
+		<cartList :cartData="cartData" @closeList="closeList" @ChangeCartNumDan="ChangeCartList"
+			@ChangeSubDel="ChangeSubDel" @ChangeOneDel="ChangeOneDel"></cartList>
+		<productWindow :attr="attr" :isShow='1' :iSplus='1' :iScart='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
+			@ChangeCartNum="ChangeCartNumDuo" @attrVal="attrVal" @iptCartNum="iptCartNum" @goCat="goCatNum"
+			:is_vip="is_vip" id='product-window'></productWindow>
+		<ParabalaBall ref="Ball"></ParabalaBall>
+	</view>
+</template>
+
+<script>
+	import ParabalaBall from '@/components/parabolaBall/ParabolaBall.vue'
+	import {
+		getCategoryList,
+		getProductslist,
+		getAttr,
+		postCartNum
+	} from '@/api/store.js';
+	import {
+		vcartList,
+		getCartCounts,
+		cartDel
+	} from '@/api/order.js';
+	import productWindow from '@/components/productWindow';
+	import goodClass from '@/components/goodClass';
+	import cartList from '@/components/cartList';
+	import {
+		mapGetters
+	} from 'vuex';
+	import {
+		goShopDetail
+	} from '@/libs/order.js';
+	import {
+		toLogin
+	} from '@/libs/login.js';
+	export default {
+		computed: mapGetters(['isLogin', 'uid']),
+		components: {
+			productWindow,
+			goodClass,
+			cartList,
+			ParabalaBall
+		},
+		props: {},
+		data() {
+			return {
+				categoryList: [],
+				navActive: 0,
+				categoryTitle: '',
+				categoryErList: [],
+				tabLeft: 0,
+				isWidth: 0, //每个导航栏占位
+				tabClick: 0, //导航栏被点击
+				iSlong: true,
+				tempArr: [],
+				loading: false,
+				loadend: false,
+				loadTitle: '加载更多',
+				page: 1,
+				limit: 10,
+				cid: 0, //一级分类
+				sid: 0, //二级分类
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				attr: {
+					cartAttr: false,
+					productAttr: [],
+					productSelect: {}
+				},
+				productValue: [],
+				attrValue: '', //已选属性
+				storeName: '', //多属性产品名称
+				id: 0,
+				cartData: {
+					cartList: [],
+					iScart: false
+				},
+				cartCount: 0,
+				totalPrice: 0.00,
+				lengthCart: 0,
+				is_vip: 0, //是否是会员
+				cart_num: 0,
+				storeInfo: {},
+				endLocation: {}
+			}
+		},
+		onShow() {
+			// if (this.isLogin) {
+			// 	this.getCartNum();
+			// 	this.getCartList(1);
+			// }
+		},
+		onLoad() {
+			console.log('aaaa')
+			this.$nextTick(() => {
+				uni.createSelectorQuery().select('#cart').boundingClientRect(res => {
+					const {
+						windowTop
+					} = uni.getSystemInfoSync()
+					this.endLocation = {
+						x: res.left + uni.upx2px(120) / 2,
+						// #ifdef H5
+						y: res.top + windowTop,
+						// #endif
+						// #ifndef H5
+						y: res.top,
+						// #endif
+					}
+				}).exec()
+			})
+		},
+		mounted() {
+			let that = this;
+			that.lengthCart = that.cartData.cartList;
+			// 获取设备宽度
+			uni.getSystemInfo({
+				success(e) {
+					that.isWidth = e.windowWidth / 5
+				}
+			});
+			// this.getAllCategory();
+		},
+		methods: {
+			jumpIndex() {
+				this.$emit('jumpIndex')
+			},
+			addCart(detail) {
+				// #ifdef H5
+				const {
+					windowTop
+				} = uni.getSystemInfoSync()
+				detail.y += windowTop
+				// #endif
+				// this.$refs.Ball.showBall({
+				// 	start: detail,
+				// 	src: [detail.img, ''][Math.round(Math.random())],
+				// 	end: this.endLocation
+				// }).then(() => {})
+			},
+			// 生成订单；
+			subOrder: function() {
+				let that = this,
+					list = that.cartData.cartList,
+					ids = [];
+				if (list.length) {
+					list.forEach(item => {
+						ids.push(item.id)
+					});
+					uni.navigateTo({
+						url: '/pages/users/order_confirm/index?cartId=' + ids.join(',')
+					});
+					that.cartData.iScart = false;
+				} else {
+					return that.$util.Tips({
+						title: '请选择产品'
+					});
+				}
+			},
+			// 计算总价；
+			getTotalPrice: function() {
+				let that = this,
+					list = that.cartData.cartList,
+					totalPrice = 0.00;
+				list.forEach(item => {
+					if (item.attrStatus && item.status) {
+						totalPrice = that.$util.$h.Add(totalPrice, that.$util.$h.Mul(item.cart_num, item
+							.truePrice));
+					}
+				})
+				that.$set(that, 'totalPrice', totalPrice);
+			},
+			ChangeSubDel: function(event) {
+				let that = this,
+					list = that.cartData.cartList,
+					ids = [];
+				list.forEach(item => {
+					ids.push(item.id)
+				});
+				cartDel(ids.join(",")).then(res => {
+					that.$set(that.cartData, 'cartList', []);
+					that.cartData.iScart = false;
+					that.totalPrice = 0.00;
+					that.page = 1;
+					that.loadend = false;
+					that.tempArr = [];
+					that.productslist();
+					that.getCartNum();
+				})
+			},
+			ChangeOneDel: function(id, index) {
+				let that = this,
+					list = that.cartData.cartList;
+				cartDel(id.toString()).then(res => {
+					list.splice(index, 1);
+					if (!list.length) {
+						that.cartData.iScart = false;
+						that.page = 1;
+						that.loadend = false;
+						that.tempArr = [];
+						that.productslist();
+					};
+					that.getCartNum();
+				})
+			},
+			getCartList(iSshow) {
+				let that = this;
+				vcartList().then(res => {
+					that.$set(that.cartData, 'cartList', res.data);
+					if (res.data.length) {
+						that.$set(that.cartData, 'iScart', iSshow ? false : !that.cartData.iScart);
+					} else {
+						that.$set(that.cartData, 'iScart', false);
+					}
+					that.getTotalPrice();
+				})
+			},
+			closeList(e) {
+				this.$set(this.cartData, 'iScart', e);
+				this.page = 1;
+				this.loadend = false;
+				this.tempArr = [];
+				this.productslist();
+			},
+			getCartNum: function() {
+				let that = this;
+				getCartCounts().then(res => {
+					that.cartCount = res.data.count;
+					console.log(that.$refs.goodClass)
+					that.$refs.goodClass.addIng = false
+				});
+			},
+
+
+			onMyEvent: function() {
+				this.$set(this.attr, 'cartAttr', false);
+			},
+			/**
+			 * 默认选中属性
+			 * 
+			 */
+			DefaultSelect: function() {
+				let productAttr = this.attr.productAttr;
+				let value = [];
+				for (let key in this.productValue) {
+					if (this.productValue[key].stock > 0) {
+						value = this.attr.productAttr.length ? key.split(",") : [];
+						break;
+					}
+				}
+				for (let i = 0; i < productAttr.length; i++) {
+					this.$set(productAttr[i], "index", value[i]);
+				}
+				//sort();排序函数:数字-英文-汉字；
+				let productSelect = this.productValue[value.join(",")];
+				if (productSelect && productAttr.length) {
+					this.$set(
+						this.attr.productSelect,
+						"store_name",
+						this.storeName
+					);
+					this.$set(this.attr.productSelect, "image", productSelect.image);
+					this.$set(this.attr.productSelect, "price", productSelect.price);
+					this.$set(this.attr.productSelect, "stock", productSelect.stock);
+					this.$set(this.attr.productSelect, "unique", productSelect.unique);
+					this.$set(this.attr.productSelect, "cart_num", 1);
+					this.$set(this.attr.productSelect, 'vip_price', productSelect.vip_price);
+					this.$set(this, "attrValue", value.join(","));
+				} else if (!productSelect && productAttr.length) {
+					this.$set(
+						this.attr.productSelect,
+						"store_name",
+						this.storeName
+					);
+					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
+					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
+					this.$set(this.attr.productSelect, "stock", 0);
+					this.$set(this.attr.productSelect, "unique", "");
+					this.$set(this.attr.productSelect, "cart_num", 0);
+					this.$set(this, "attrValue", "");
+					this.$set(this.attr.productSelect, 'vip_price', this.storeInfo.vip_price);
+				} else if (!productSelect && !productAttr.length) {
+					this.$set(
+						this.attr.productSelect,
+						"store_name",
+						this.storeName
+					);
+					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
+					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
+					this.$set(this.attr.productSelect, "stock", this.storeInfo.stock);
+					this.$set(
+						this.attr.productSelect,
+						"unique",
+						this.storeInfo.unique || ""
+					);
+					this.$set(this.attr.productSelect, "cart_num", 1);
+					this.$set(this, "attrValue", "");
+					this.$set(this.attr.productSelect, 'vip_price', this.storeInfo.vip_price);
+				}
+			},
+			/**
+			 * 属性变动赋值
+			 * 
+			 */
+			ChangeAttr: function(res) {
+				let productSelect = this.productValue[res];
+				if (productSelect && productSelect.stock > 0) {
+					this.$set(this.attr.productSelect, "image", productSelect.image);
+					this.$set(this.attr.productSelect, "price", productSelect.price);
+					this.$set(this.attr.productSelect, "stock", productSelect.stock);
+					this.$set(this.attr.productSelect, "unique", productSelect.unique);
+					this.$set(this.attr.productSelect, 'vip_price', productSelect.vip_price);
+					this.$set(this.attr.productSelect, "cart_num", 1);
+					this.$set(this, "attrValue", res);
+				} else if (productSelect && productSelect.stock == 0) {
+					this.$set(this.attr.productSelect, "image", productSelect.image);
+					this.$set(this.attr.productSelect, "price", productSelect.price);
+					this.$set(this.attr.productSelect, "stock", 0);
+					this.$set(this.attr.productSelect, "unique", "");
+					this.$set(this.attr.productSelect, 'vip_price', productSelect.vip_price);
+					this.$set(this.attr.productSelect, "cart_num", 0);
+					this.$set(this, "attrValue", "");
+				} else {
+					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
+					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
+					this.$set(this.attr.productSelect, "stock", 0);
+					this.$set(this.attr.productSelect, "unique", "");
+					this.$set(this.attr.productSelect, 'vip_price', this.storeInfo.vip_price);
+					this.$set(this.attr.productSelect, "cart_num", 0);
+					this.$set(this, "attrValue", "");
+				}
+			},
+			attrVal(val) {
+				this.$set(this.attr.productAttr[val.indexw], 'index', this.attr.productAttr[val.indexw].attr_values[val
+					.indexn]);
+			},
+			/**
+			 * 购物车手动填写
+			 * 
+			 */
+			iptCartNum: function(e) {
+				this.$set(this.attr.productSelect, 'cart_num', e);
+			},
+			onLoadFun() {},
+			// 产品列表
+			productslist: function() {
+				let that = this;
+				if (that.loadend) return;
+				if (that.loading) return;
+				that.loading = true;
+				that.loadTitle = '';
+				getProductslist({
+					page: that.page,
+					limit: that.limit,
+					type: 1,
+					cid: that.cid,
+					sid: that.sid
+				}).then(res => {
+					let list = res.data,
+						loadend = list.length < that.limit;
+					that.tempArr = that.$util.SplitArray(list, that.tempArr);
+					that.$set(that, 'tempArr', that.tempArr);
+					that.loading = false;
+					that.loadend = loadend;
+					that.loadTitle = loadend ? "人家是有底线的~" : "加载更多";
+					that.page = that.page + 1;
+				}).catch(err => {
+					that.loading = false,
+						that.loadTitle = '加载更多'
+				});
+			},
+
+			// 改变单属性购物车
+			ChangeCartNumDan(changeValue, index, item) {
+				let num = this.tempArr[index];
+				let stock = this.tempArr[index].stock;
+				this.ChangeCartNum(changeValue, num, stock, 0, item.id);
+			},
+			// 改变多属性购物车
+			ChangeCartNumDuo(changeValue) {
+				//获取当前变动属性
+				let productSelect = this.productValue[this.attrValue];
+				//如果没有属性,赋值给商品默认库存
+				if (productSelect === undefined && !this.attr.productAttr.length)
+					productSelect = this.attr.productSelect;
+				//无属性值即库存为0；不存在加减；
+				if (productSelect === undefined) return;
+				let stock = productSelect.stock || 0;
+				let num = this.attr.productSelect;
+				this.ChangeCartNum(changeValue, num, stock, 1, this.id);
+			},
+			// 已经加入购物车时的购物加减；
+			ChangeCartList(changeValue, index) {
+				let list = this.cartData.cartList;
+				let num = list[index];
+				let stock = list[index].trueStock;
+				this.ChangeCartNum(changeValue, num, stock, 0, num.product_id, index, 1);
+				if (!list.length) {
+					this.cartData.iScart = false;
+					this.page = 1;
+					this.loadend = false;
+					this.tempArr = [];
+					this.productslist();
+				}
+			},
+			// 购物车加减计算函数
+			ChangeCartNum(changeValue, num, stock, isDuo, id, index, cart) {
+				if (changeValue) {
+					num.cart_num++;
+					if (num.cart_num > stock) {
+						if (isDuo) {
+							this.$set(this.attr.productSelect, "cart_num", stock ? stock : 1);
+							this.$set(this, "cart_num", stock ? stock : 1);
+						} else {
+							num.cart_num = stock ? stock : 0;
+							this.$set(this, 'tempArr', this.tempArr);
+							this.$set(this.cartData, 'cartList', this.cartData.cartList);
+						}
+						return this.$util.Tips({
+							title: "该产品没有更多库存了"
+						});
+					} else {
+						if (!isDuo) {
+							if (cart) {
+								this.goCat(0, id, 1, 1, num.product_attr_unique);
+								this.getTotalPrice();
+							} else {
+								this.goCat(0, id, 1);
+							}
+						}
+					}
+				} else {
+					num.cart_num--;
+					if (num.cart_num == 0) {
+						this.cartData.cartList.splice(index, 1);
+						if (isDuo) {
+							this.$set(this.attr.productSelect, "cart_num", 1);
+							this.$set(this, "cart_num", 1);
+						}
+					}
+					if (num.cart_num < 0) {
+						if (isDuo) {
+							this.$set(this.attr.productSelect, "cart_num", 1);
+							this.$set(this, "cart_num", 1);
+						} else {
+							num.cart_num = 0;
+							this.$set(this, 'tempArr', this.tempArr);
+							this.$set(this.cartData, 'cartList', this.cartData.cartList);
+						}
+					} else {
+						if (!isDuo) {
+							if (cart) {
+								this.goCat(0, id, 0, 1, num.product_attr_unique);
+								this.getTotalPrice();
+							} else {
+								this.goCat(0, id, 0);
+							}
+						}
+					}
+				}
+
+			},
+			// 多规格加入购物车；
+			goCatNum() {
+				this.goCat(1, this.id, 1);
+			},
+			/*
+			 * 加入购物车
+			 */
+			goCat: function(duo, id, type, cart, unique) {
+				let that = this;
+				if (duo) {
+					let productSelect = that.productValue[this.attrValue];
+					//如果有属性,没有选择,提示用户选择
+					if (
+						that.attr.productAttr.length &&
+						productSelect === undefined
+					)
+						return that.$util.Tips({
+							title: "产品库存不足，请选择其它属性"
+						});
+				}
+				let q = {
+					product_id: id,
+					num: duo ? that.attr.productSelect.cart_num : 1,
+					type: type,
+					unique: duo ? that.attr.productSelect.unique : cart ? unique : ""
+				};
+				postCartNum(q)
+					.then(function(res) {
+						if (duo) {
+							that.attr.cartAttr = false;
+							that.$util.Tips({
+								title: "添加购物车成功"
+							});
+							// that.page = 1;
+							// that.loadend = false;
+							that.tempArr.forEach((item, index) => {
+								if (item.id == that.id) {
+									let arrtStock = that.attr.productSelect.stock
+									let objNum = parseInt(item.cart_num) + parseInt(that.attr.productSelect
+										.cart_num);
+									item.cart_num = objNum > arrtStock ? arrtStock : objNum
+								}
+							})
+							// that.productslist();
+						}
+						that.getCartNum();
+						if (!cart) {
+							that.getCartList(1);
+						}
+					})
+					.catch(err => {
+						return that.$util.Tips({
+							title: err
+						});
+					});
+			},
+			// 点击默认单属性购物车
+			goCartDan(item, index) {
+				if (!this.isLogin) {
+					this.getIsLogin();
+				} else {
+					if (!item.cart_button) {
+						goShopDetail(item, this.uid).then(res => {
+							uni.navigateTo({
+								url: `/pages/goods_details/index?id=${item.id}`
+							});
+						});
+						return
+					}
+					this.tempArr[index].cart_num = 1;
+					this.$set(this, 'tempArr', this.tempArr);
+					this.goCat(0, item.id, 1);
+				}
+			},
+			goCartDuo(item) {
+				if (!this.isLogin) {
+					this.getIsLogin();
+				} else {
+					if (!item.cart_button) {
+						goShopDetail(item, this.uid).then(res => {
+							uni.navigateTo({
+								url: `/pages/goods_details/index?id=${item.id}`
+							});
+						});
+						return
+					}
+					uni.showLoading({
+						title: '加载中'
+					});
+
+					this.storeName = item.store_name;
+					this.getAttrs(item.id);
+					this.$set(this, 'id', item.id);
+					this.$set(this.attr, 'cartAttr', true);
+				}
+			},
+			getIsLogin() {
+				toLogin();
+			},
+			// 商品详情接口；
+			getAttrs(id) {
+				let that = this;
+				getAttr(id, 0).then(res => {
+					uni.hideLoading();
+					that.$set(that.attr, 'productAttr', res.data.productAttr);
+					that.$set(that, 'productValue', res.data.productValue);
+					that.$set(that, 'is_vip', res.data.storeInfo.is_vip);
+					that.$set(that, 'storeInfo', res.data.storeInfo);
+					that.DefaultSelect();
+				})
+			},
+			// 去详情页
+			goDetail(item) {
+				if (!this.isLogin) {
+					toLogin();
+				} else {
+					goShopDetail(item, this.uid).then(res => {
+						uni.navigateTo({
+							url: `/pages/goods_details/index?id=${item.id}`
+						});
+					});
+				}
+			},
+
+
+			openTap() {
+				this.iSlong = false
+			},
+			closeTap() {
+				this.iSlong = true
+			},
+			getAllCategory: function() {
+				let that = this;
+				getCategoryList().then(res => {
+					let data = res.data;
+					data.forEach(item => {
+						item.children.unshift({
+							'id': 0,
+							'cate_name': '全部'
+						})
+					})
+					that.categoryTitle = data[0].cate_name;
+					that.cid = data[0].id;
+					that.sid = 0;
+					that.navActive = 0;
+					that.tabClick = 0;
+					that.categoryList = data;
+					that.categoryErList = res.data[0].children ? res.data[0].children : [];
+					that.page = 1;
+					that.loadend = false;
+					that.tempArr = [];
+					that.productslist();
+				})
+			},
+			tapNav(index, item) {
+				let list = this.categoryList[index];
+				this.navActive = index;
+				this.categoryTitle = list.cate_name;
+				this.categoryErList = item.children ? item.children : [];
+				this.tabClick = 0;
+				this.tabLeft = 0;
+				this.cid = list.id;
+				this.sid = 0;
+				this.page = 1;
+				this.loadend = false;
+				this.tempArr = [];
+				this.productslist();
+			},
+			// 导航栏点击
+			longClick(index) {
+				if (this.categoryErList.length > 3) {
+					this.tabLeft = (index - 1) * (this.isWidth + 6) //设置下划线位置
+				};
+				this.tabClick = index; //设置导航点击了哪一个
+				this.iSlong = true;
+				this.sid = this.categoryErList[index].id;
+				this.page = 1;
+				this.loadend = false;
+				this.tempArr = [];
+				this.productslist();
+			},
+		},
+		onReachBottom: function() {
+			this.productslist();
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #fff;
+	}
+
+	/deep/.product-window.joinCart {
+		z-index: 999;
+	}
+
+	::-webkit-scrollbar {
+		width: 0;
+		height: 0;
+		color: transparent;
+		display: none;
+	}
+
+	.goodCate {
+		/deep/.mask {
+			z-index: 99;
+		}
+
+		/deep/.attrProduct {
+			.mask {
+				z-index: 100;
+			}
+		}
+
+		.header {
+			position: fixed;
+			height: 128rpx;
+			background-color: #fff;
+			top: 0;
+			left: 0;
+			width: 100%;
+			z-index: 99;
+			border-bottom: 1px solid #eee;
+			padding: 0 28rpx;
+
+			.pageIndex {
+				width: 68rpx;
+				height: 68rpx;
+				border-radius: 50%;
+				background-color: var(--view-theme);
+
+				.iconfont {
+					color: #fff;
+					font-size: 30rpx;
+				}
+
+				// image{
+				// 	width: 29rpx;
+				// 	height: 30rpx;
+				// }
+			}
+
+			.search {
+				width: 600rpx;
+				height: 68rpx;
+				border-radius: 36rpx;
+				background-color: #F7F7F7;
+				font-size: 26rpx;
+				color: #cccccc;
+				margin-left: 22rpx;
+				padding: 0 30rpx;
+				box-sizing: border-box;
+
+				.iconfont {
+					font-size: 30rpx;
+					margin-right: 18rpx;
+					color: #666666;
+				}
+
+				// image{
+				// 	width: 27rpx;
+				// 	height: 27rpx;
+				// 	margin-right: 18rpx;
+				// }
+			}
+		}
+
+		.conter {
+			margin-top: 128rpx;
+			height: 100vh;
+			background-color: #fff;
+
+			.aside {
+				position: fixed;
+				width: 23%;
+				left: 0;
+				bottom: 0;
+				top: 0;
+				background-color: #F7F7F7;
+				overflow-y: auto;
+				overflow-x: hidden;
+				margin-top: 128rpx;
+				z-index: 99;
+				padding-bottom: 140rpx;
+
+				.item {
+					height: 100rpx;
+					width: 100%;
+					font-size: 26rpx;
+					color: #333333;
+
+					&.on {
+						background-color: #FFFFFF;
+						width: 100%;
+						text-align: center;
+						color: var(--view-theme);
+						font-weight: 500;
+						position: relative;
+
+						&::after {
+							content: "";
+							position: absolute;
+							width: 6rpx;
+							height: 46rpx;
+							background: var(--view-theme);
+							border-radius: 0 4rpx 4rpx 0;
+							left: 0
+						}
+					}
+				}
+			}
+
+			.wrapper {
+				margin-top: 104rpx;
+				width: 77%;
+				float: right;
+				background-color: #FFFFFF;
+				padding-bottom: 130rpx;
+
+				.bgcolor {
+					width: 100%;
+					background-color: #FFFFFF;
+				}
+
+				.goodsList {
+					margin-top: 0 !important;
+				}
+
+				.mask {
+					z-index: 9;
+				}
+
+				.longTab {
+					width: 65%;
+					position: fixed;
+					top: 0;
+					margin-top: 128rpx;
+					height: 100rpx;
+					z-index: 99;
+					background-color: #FFFFFF;
+
+					.longItem {
+						height: 44rpx;
+						display: inline-block;
+						line-height: 44rpx;
+						text-align: center;
+						font-size: 26rpx;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+						color: #333333;
+						background-color: #F7F7F7;
+						border-radius: 22rpx;
+						margin-left: 12rpx;
+
+						&.click {
+							font-weight: bold;
+							background-color: var(--view-theme);
+							color: #ffffff;
+						}
+					}
+
+					.underlineBox {
+						height: 3px;
+						width: 20%;
+						display: flex;
+						align-content: center;
+						justify-content: center;
+						transition: .5s;
+
+						.underline {
+							width: 33rpx;
+							height: 4rpx;
+							background-color: #FFFFFF;
+						}
+					}
+				}
+
+				.openList {
+					width: 12%;
+					height: 100rpx;
+					background-color: #FFFFFF;
+					line-height: 100rpx;
+					padding-left: 30rpx;
+					position: fixed;
+					right: 0;
+					top: 128rpx;
+					z-index: 99;
+
+					.iconfont {
+						font-size: 22rpx;
+						color: #666666;
+					}
+				}
+
+				.downTab {
+					width: 77%;
+					position: fixed;
+					top: 0;
+					margin-top: 128rpx;
+					z-index: 99;
+					background-color: #FFFFFF;
+					right: 0;
+
+					.title {
+						height: 100rpx;
+						font-size: 26rpx;
+						color: #999999;
+						padding-left: 20rpx;
+
+						.closeList {
+							width: 90rpx;
+							height: 100%;
+							line-height: 100rpx;
+							padding-left: 30rpx;
+							transform: rotate(180deg);
+
+							.iconfont {
+								font-size: 22rpx;
+								color: #666666;
+							}
+						}
+					}
+
+					.children {
+						max-height: 500rpx;
+						overflow-x: hidden;
+						overflow-y: auto;
+						padding-bottom: 20rpx;
+
+						.item {
+							height: 60rpx;
+							background-color: #F7F7F7;
+							border-radius: 30rpx;
+							line-height: 60rpx;
+							padding: 0 15rpx;
+							margin: 0 0 20rpx 20rpx;
+							width: 165rpx;
+							text-align: center;
+
+							&.click {
+								font-weight: bold;
+								background-color: var(--view-theme);
+								color: #ffffff;
+							}
+						}
+					}
+				}
+
+				.goodsList {
+					margin-top: 228rpx;
+					padding: 0 20rpx 0 20rpx;
+
+					/deep/.item {
+						margin-bottom: 33rpx !important;
+
+						// .pictrue {
+						// 	height: 216rpx;
+						// }
+
+						.text {
+							font-size: 26rpx;
+						}
+
+						.bottom {
+							padding-right: 18rpx;
+
+							.sales {
+								.money {
+									font-size: 34rpx;
+
+									text {
+										font-size: 26rpx;
+									}
+								}
+							}
+
+							.cart {
+								.pictrue {
+									width: 50rpx;
+									height: 50rpx;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		.footer {
+			width: 100%;
+			position: fixed;
+			left: 0;
+			bottom: 0;
+			background-color: #fff;
+			box-shadow: 0px -3px 16px rgba(36, 12, 12, 0.05);
+			z-index: 101;
+			padding-left: 30rpx;
+			box-sizing: border-box;
+			height: 100rpx;
+			bottom: 98rpx;
+
+			.cartIcon {
+				width: 124rpx;
+				height: 106rpx;
+				position: relative;
+				margin-top: -64rpx;
+
+				.iconfont {
+					font-size: 100rpx;
+					color: var(--view-theme);
+				}
+
+				.num {
+					min-width: 12rpx;
+					color: var(--view-theme);
+					border-radius: 15px;
+					position: absolute;
+					right: 0;
+					font-size: 16rpx;
+					padding: 0 11rpx;
+					background-color: #fff;
+					height: 36rpx;
+					line-height: 34rpx;
+					top: 24rpx;
+					border: 1rpx solid var(--view-theme)
+				}
+			}
+
+			.money {
+				font-size: 26rpx;
+				font-weight: bold;
+				color: var(--view-priceColor);
+				margin-right: 34rpx;
+
+				.num {
+					font-size: 34rpx;
+				}
+			}
+
+			.bnt {
+				width: 222rpx;
+				height: 76rpx;
+				background-color: var(--view-theme);
+				border-radius: 46px;
+				line-height: 76rpx;
+				text-align: center;
+				color: #fff;
+				font-size: 28rpx;
+				margin-right: 30rpx;
+
+				&.on {
+					background: #bbbbbb;
+				}
+			}
+		}
+	}
 </style>
diff --git a/template/uni-app/pages/user/index.vue b/template/uni-app/pages/user/index.vue
index e01df2ebc..4f110997d 100644
--- a/template/uni-app/pages/user/index.vue
+++ b/template/uni-app/pages/user/index.vue
@@ -424,19 +424,18 @@
 					}
 				})
 			}
-
 			// #ifdef MP
 			// 小程序静默授权
 			if (!this.$store.getters.isLogin) {
-				Routine.getCode()
-					.then(code => {
-						Routine.silenceAuth(code).then(res => {
-							this.onLoadFun();
-						})
-					})
-					.catch(res => {
-						uni.hideLoading();
-					});
+				// Routine.getCode()
+				// 	.then(code => {
+				// 		Routine.silenceAuth(code).then(res => {
+				// 			this.onLoadFun();
+				// 		})
+				// 	})
+				// 	.catch(res => {
+				// 		uni.hideLoading();
+				// 	});
 			}
 			// #endif
 
@@ -569,50 +568,52 @@
 			},
 			//小程序授权api替换 getUserInfo
 			getUserProfile() {
-				uni.showLoading({
-					title: '获取中'
-				});
-				let self = this;
-				Routine.getUserProfile()
-					.then(res => {
-						Routine.getCode()
-							.then(code => {
-								let userInfo = res.userInfo;
-								userInfo.code = code;
-								userInfo.spread_spid = app.globalData.spid; //获取推广人ID
-								userInfo.spread_code = app.globalData.code; //获取推广人分享二维码ID
-								Routine.authUserInfo(userInfo)
-									.then(res => {
-										if (res.data.key !== undefined && res.data.key) {
-											uni.hideLoading();
-											self.authKey = res.data.key;
-											self.isPhoneBox = true;
-										} else {
-											uni.hideLoading();
-											let time = res.data.expires_time - self.$Cache.time();
-											self.$store.commit('LOGIN', {
-												token: res.data.token,
-												time: time
-											});
-											this.getUserInfo()
-										}
-									})
-									.catch(res => {
-										uni.hideLoading();
-										uni.showToast({
-											title: res.msg,
-											icon: 'none',
-											duration: 2000
-										});
-									});
-							})
-							.catch(res => {
-								uni.hideLoading();
-							});
-					})
-					.catch(res => {
-						uni.hideLoading();
-					});
+				console.log('去登录')
+				toLogin();
+				// uni.showLoading({
+				// 	title: '获取中'
+				// });
+				// let self = this;
+				// Routine.getUserProfile()
+				// 	.then(res => {
+				// 		Routine.getCode()
+				// 			.then(code => {
+				// 				let userInfo = res.userInfo;
+				// 				userInfo.code = code;
+				// 				userInfo.spread_spid = app.globalData.spid; //获取推广人ID
+				// 				userInfo.spread_code = app.globalData.code; //获取推广人分享二维码ID
+				// 				Routine.authUserInfo(userInfo)
+				// 					.then(res => {
+				// 						if (res.data.key !== undefined && res.data.key) {
+				// 							uni.hideLoading();
+				// 							self.authKey = res.data.key;
+				// 							self.isPhoneBox = true;
+				// 						} else {
+				// 							uni.hideLoading();
+				// 							let time = res.data.expires_time - self.$Cache.time();
+				// 							self.$store.commit('LOGIN', {
+				// 								token: res.data.token,
+				// 								time: time
+				// 							});
+				// 							this.getUserInfo()
+				// 						}
+				// 					})
+				// 					.catch(res => {
+				// 						uni.hideLoading();
+				// 						uni.showToast({
+				// 							title: res.msg,
+				// 							icon: 'none',
+				// 							duration: 2000
+				// 						});
+				// 					});
+				// 			})
+				// 			.catch(res => {
+				// 				uni.hideLoading();
+				// 			});
+				// 	})
+				// 	.catch(res => {
+				// 		uni.hideLoading();
+				// 	});
 			},
 			/**
 			 * 
diff --git a/template/uni-app/pages/users/order_confirm/index.vue b/template/uni-app/pages/users/order_confirm/index.vue
index 6645c1606..6994c3b44 100644
--- a/template/uni-app/pages/users/order_confirm/index.vue
+++ b/template/uni-app/pages/users/order_confirm/index.vue
@@ -820,7 +820,8 @@
 					} else {
 						that.cartArr[3].payStatus = 1
 					}
-
+					//好友代付是否开启
+					that.cartArr[4].payStatus = res.data.friend_pay_status || 0;
 					// that.$set(that, 'cartArr', that.cartArr);
 					that.$set(that, 'ChangePrice', that.totalPrice);
 					that.getBargainId();
diff --git a/template/uni-app/pages/users/order_details/index.vue b/template/uni-app/pages/users/order_details/index.vue
index 25df12656..38ca9b508 100644
--- a/template/uni-app/pages/users/order_details/index.vue
+++ b/template/uni-app/pages/users/order_details/index.vue
@@ -221,7 +221,7 @@
 				</view>
 			</view>
 			<!-- 退款订单详情 -->
-			<view class='wrapper' v-if="isGoodsReturn">
+			<view class='wrapper' v-if="isGoodsReturn && orderInfo.cartInfo[0].productInfo.virtual_type != 3">
 				<view class='item acea-row row-between'>
 					<view>收货人：</view>
 					<view class='conter'>{{orderInfo.real_name}}</view>
@@ -956,6 +956,9 @@
 						if (item.value == 'yue') {
 							item.payStatus = res.data.yue_pay_status == 1 ? true : false;
 						}
+						if (item.value == 'friend') {
+							item.payStatus = res.data.friend_pay_status == 1 ? true : false;
+						}
 					});
 					that.getOrderStatus();
 				}).catch(err => {
diff --git a/template/uni-app/pages/users/order_list/index.vue b/template/uni-app/pages/users/order_list/index.vue
index 929448792..105e1a996 100644
--- a/template/uni-app/pages/users/order_list/index.vue
+++ b/template/uni-app/pages/users/order_list/index.vue
@@ -285,6 +285,9 @@
 						}
 						if (item.value == 'yue') {
 							item.payStatus = res.data.yue_pay_status == 1 ? true : false;
+						}
+						if (item.value == 'friend') {
+							item.payStatus = res.data.friend_pay_status == 1 ? true : false;
 						}
 					});
 					//#ifdef MP
diff --git a/template/uni-app/pages/users/user_info/index.vue b/template/uni-app/pages/users/user_info/index.vue
index 9a80e511c..380d2e58b 100644
--- a/template/uni-app/pages/users/user_info/index.vue
+++ b/template/uni-app/pages/users/user_info/index.vue
@@ -125,7 +125,7 @@
 				</view>
 
 				<button class='modifyBnt bg-color' formType="submit">保存修改</button>
-				<!-- #ifdef H5 || APP-PLUS -->
+				<!-- #ifdef H5 || APP-PLUS || MP -->
 				<view class="logOut cartcolor acea-row row-center-wrapper" @click="outLogin">退出登录</view>
 				<!-- #endif -->
 				<!-- #ifdef APP-PLUS -->
diff --git a/template/uni-app/pages/users/user_spread_user/index.vue b/template/uni-app/pages/users/user_spread_user/index.vue
index e46cf1526..27a08b934 100644
--- a/template/uni-app/pages/users/user_spread_user/index.vue
+++ b/template/uni-app/pages/users/user_spread_user/index.vue
@@ -27,7 +27,7 @@
 					</view>
 				</view>
 				<!-- <view class="apply"
-					v-if="(userInfo.is_division && userInfo.division_invite && userInfo.division_status) || (!userInfo.is_division && !userInfo.is_agent) && userInfo.id">
+					v-if="userInfo.division_open && ((userInfo.is_division && userInfo.division_invite && userInfo.division_status) || (!userInfo.is_division && !userInfo.is_agent))">
 					<view v-if="userInfo.is_division">邀请码：{{userInfo.division_invite}}</view>
 					<view v-if="!userInfo.is_division && !userInfo.is_agent">
 						<navigator url='/pages/annex/settled/index' hover-class="none">
@@ -59,12 +59,12 @@
 					<view>佣金明细</view>
 				</navigator>
 
-				<navigator  v-if="!userInfo.is_agent && !userInfo.is_division" url='/pages/users/promoter-order/index' hover-class="none"
+				<navigator  v-if="(userInfo.division_open && !userInfo.is_agent && !userInfo.is_division) || !userInfo.division_open" url='/pages/users/promoter-order/index' hover-class="none"
 					class='item acea-row row-center-wrapper row-column'>
 					<text class='iconfont icon-dingdan'></text>
 					<view>推广人订单</view>
 				</navigator>
-				<navigator v-if="userInfo.is_agent || userInfo.is_division" url='/pages/users/promoter-order/index?type=1' hover-class="none"
+				<navigator v-if="userInfo.division_open && (userInfo.is_agent || userInfo.is_division)" url='/pages/users/promoter-order/index?type=1' hover-class="none"
 					class='item acea-row row-center-wrapper row-column'>
 					<text class='iconfont icon-dingdan'></text>
 					<view>{{userInfo.is_division?'事业部':'代理商'}}推广订单</view>
@@ -79,7 +79,7 @@
 					<text class='iconfont icon-paihang'></text>
 					<view>佣金排行</view>
 				</navigator>
-				<navigator v-if="userInfo.is_agent" url='/pages/users/staff_list/index' hover-class="none"
+				<navigator v-if="userInfo.division_open && userInfo.is_agent" url='/pages/users/staff_list/index' hover-class="none"
 					class='item acea-row row-center-wrapper row-column'>
 					<text class='iconfont icon-tuandui'></text>
 					<view>员工列表</view>
diff --git a/template/uni-app/store/modules/app.js b/template/uni-app/store/modules/app.js
index 4ead21836..50c0ed954 100644
--- a/template/uni-app/store/modules/app.js
+++ b/template/uni-app/store/modules/app.js
@@ -46,8 +46,8 @@ const mutations = {
 		state.token = token;
 	},
 	LOGOUT(state) {
-		state.token = undefined;
-		state.uid = undefined
+		state.token = false;
+		state.uid = 0
 		Cache.clear(LOGIN_STATUS);
 		Cache.clear(UID);
 	},