From 843fce64ee0c83315d91d4feea9a44d67b4809ff Mon Sep 17 00:00:00 2001
From: wulunyi <wulunyi@meituan.com>
Date: Sun, 10 May 2020 13:48:46 +0800
Subject: [PATCH] =?UTF-8?q?feat(master):=20=E5=8A=A0=E5=85=A5=20vuex=20?=
 =?UTF-8?q?=E7=9A=84=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                          |  1 +
 src/App.vue                         |  4 +-
 src/main.js                         | 17 +++++++
 src/main.ts                         | 18 --------
 src/pages/addArddess/addArddess.vue |  2 +-
 src/pages/index/index.vue           | 92 ++++++++++++++++++++-----------------
 src/pages/myOrder/myOrder.vue       | 10 ++--
 src/store/index.js                  | 24 ++++++++++
 src/store/modules/test.js           | 41 +++++++++++++++++
 9 files changed, 142 insertions(+), 67 deletions(-)
 create mode 100644 src/main.js
 delete mode 100644 src/main.ts
 create mode 100644 src/store/index.js
 create mode 100644 src/store/modules/test.js

diff --git a/.gitignore b/.gitignore
index 908df90..b2cc0a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 node_modules/
 unpackage/
 dist/
+.history
 
 # local env files
 .env.local
diff --git a/src/App.vue b/src/App.vue
index 078c0d0..a789f9f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -6,7 +6,7 @@
             console.log('App Launch')
         },
         onShow() {
-
+
             console.log('App Show')
         },
         onHide() {
@@ -17,4 +17,4 @@
 
 <style>
     /*每个页面公共css */
-</style>
+</style>
diff --git a/src/main.js b/src/main.js
new file mode 100644
index 0000000..d743e22
--- /dev/null
+++ b/src/main.js
@@ -0,0 +1,17 @@
+import Vue from 'vue'
+import App from './App.vue'
+import store from './store/index'
+
+Vue.config.productionTip = false
+Vue.prototype.sendRequest = function(param){
+	let _self = this,
+		url = param.url,
+		data = param.data,
+		header = param.header,
+		token = '';
+	//拼接完整请求url
+	let requestUrl = this.baseUrl + url;
+}
+
+
+new App({store}).$mount()
diff --git a/src/main.ts b/src/main.ts
deleted file mode 100644
index c297f79..0000000
--- a/src/main.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import Vue from 'vue'
-import App from './App.vue'
-
-
-Vue.config.productionTip = false
-Vue.prototype.sendRequest = function(param:any){
-	let _self = this,
-		url = param.url,
-		data = param.data,
-		header = param.header,
-		token = '';
-	//拼接完整请求url
-	let requestUrl = this.baseUrl + url;
-	
-	
-		
-}
-new App().$mount()
diff --git a/src/pages/addArddess/addArddess.vue b/src/pages/addArddess/addArddess.vue
index 565c241..1a1847e 100644
--- a/src/pages/addArddess/addArddess.vue
+++ b/src/pages/addArddess/addArddess.vue
@@ -30,7 +30,7 @@
 </template>
 
 <script>
-	import SimpleAddress from '@/components/Simple-address/Simple-address.vue';
+	import SimpleAddress from '@/components/Simple-address/simple-address.vue';
 	export default {
 		data() {
 			return {
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 4061a78..8326cb2 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -77,10 +77,12 @@
 </template>
 
 <script>
-import UniDrawer from "@/components/Uni-drawer/Uni-drawer.vue";
+import UniDrawer from "../../components/uni-drawer/uni-drawer.vue";
 import Card from "../../components/Card/Card.vue";
 import HMfilterDropdown from "../../components/HM-filterDropdown/HM-filterDropdown.vue";
 import data from "@/common/data.js"; //筛选菜单数据
+import store from '@/store';
+
 export default {
   components: {
     UniDrawer: UniDrawer,
@@ -101,57 +103,65 @@ export default {
       indexArr: "",
       valueArr: "",
       // //商品数据
-      goodsList: [
-        {
-        //   goods_id: 0,
-        //   img: "/static/img/goods/p1.jpg",
-        //   name: "商品名称",
-        //   originCost: "￥198",
-        //   price: "￥168",
-        //   slogan: "1235人浏览"
-        }
-      ],
+    //   goodsList: [
+    //     {
+    //     //   goods_id: 0,
+    //     //   img: "/static/img/goods/p1.jpg",
+    //     //   name: "商品名称",
+    //     //   originCost: "￥198",
+    //     //   price: "￥168",
+    //     //   slogan: "1235人浏览"
+    //     }
+    //   ],
       loadingText: "正在加载...",
       filterDropdownValue: [],
       filterData: []
     };
   },
+  computed: {
+      goodsList() {
+        // 也可以从 getters 获取
+          console.log(this.$store.getters.list);
+          return this.$store.state.test.list;
+      }
+  },
   filters: {
     outData(value) {
       return JSON.stringify(value);
     }
   },
   onLoad: function() {
-    uni.request({
-      url: "https://api.glass.xiuyetang.com/app/prod/list", 
-      method: "post",
-      data: {
-        // text: 'uni.request'
-      },
-      header: {
-        // 'custom-header': 'hello', //自定义请求头信息
-        "Content-Type": "application/x-www-form-urlencoded"
-        // 'Content-Type':'multipart/form-data'
-        // 'Content-Type':'ext/plain'
-      },
-      timeout: 3000,
-      // dataType:'json'
-      // responseType:'text',
-      // sslVerify: true,//验证 ssl 证书
-      withCredentials: false, //跨域请求时是否携带凭证（cookies）
-      success: res => {
-        console.error("success status === > ", res);
-        this.goodsList = res.data.data;
-        // console.log('res.data', res.data);
-        // this.text = 'request success';
-      },
-      fail: res => {
-        console.log("fail status === > ", res);
-      },
-      complete: res => {
-        console.log("complete status === > ", res);
-      }
-    });
+    store.dispatch('test/fetch');
+    // uni.request({
+    //   url: "https://api.glass.xiuyetang.com/app/prod/list", 
+    //   method: "post",
+    //   data: {
+    //     // text: 'uni.request'
+    //   },
+    //   header: {
+    //     // 'custom-header': 'hello', //自定义请求头信息
+    //     "Content-Type": "application/x-www-form-urlencoded"
+    //     // 'Content-Type':'multipart/form-data'
+    //     // 'Content-Type':'ext/plain'
+    //   },
+    //   timeout: 3000,
+    //   // dataType:'json'
+    //   // responseType:'text',
+    //   // sslVerify: true,//验证 ssl 证书
+    //   withCredentials: false, //跨域请求时是否携带凭证（cookies）
+    //   success: res => {
+    //     console.error("success status === > ", res);
+    //     this.goodsList = res.data.data;
+    //     // console.log('res.data', res.data);
+    //     // this.text = 'request success';
+    //   },
+    //   fail: res => {
+    //     console.log("fail status === > ", res);
+    //   },
+    //   complete: res => {
+    //     console.log("complete status === > ", res);
+    //   }
+    // });
     //定时器模拟ajax异步请求数据
     // setTimeout(()=>{
     // 	//传入defaultSelected的结构不能错，错了就报错运行异常。 不选中的项目传入null
diff --git a/src/pages/myOrder/myOrder.vue b/src/pages/myOrder/myOrder.vue
index 06c1da6..b81acdc 100644
--- a/src/pages/myOrder/myOrder.vue
+++ b/src/pages/myOrder/myOrder.vue
@@ -18,10 +18,10 @@
 			</view>
 		</view>
 		<view class="footer">已显示全部</view>
-	</view>
-</template>
+	</view>
+</template>
 <script>
-	import OrderCard from './OrderCard.vue'
+	import OrderCard from './orderCard.vue'
 	export default {
 		components:{
 			'OrderCard':OrderCard
@@ -35,7 +35,7 @@
 					{current:3,text:'待收货'},
 					{current:4,text:'退款售后'},
 					],
-				current: 0,
+				current: 0,
 				//订单数据
 				orderList:[
 					{ orderId: 0, img: '/static/img/goods/p1.jpg', name: '商品名称',originCost:'￥198',price: '￥168', orderType:1 ,buyNum:1},
@@ -47,7 +47,7 @@
 					{ orderId: 7, img: '/static/img/goods/p8.jpg', name: '商品名称',originCost:'￥198',price: '￥168', orderType:4 ,buyNum:1},
 					{ orderId: 8, img: '/static/img/goods/p9.jpg', name: '商品名称',originCost:'￥198',price: '￥168', orderType:5 ,buyNum:1},
 					{ orderId: 9, img: '/static/img/goods/p10.jpg', name: '商品名称',originCost:'￥198',price: '￥168', orderType:5 ,buyNum:1}
-				],				
+				],				
 				
 			};
 		},
diff --git a/src/store/index.js b/src/store/index.js
new file mode 100644
index 0000000..f1a9d72
--- /dev/null
+++ b/src/store/index.js
@@ -0,0 +1,24 @@
+import Vue from 'vue'
+import Vuex from 'vuex'
+
+Vue.use(Vuex)
+
+const modulesFiles = require.context('./modules', true, /\.js$/)
+
+const modules = modulesFiles.keys().reduce((modules, modulePath) => {
+  const moduleName = modulePath.replace(/^\.\/(.*)\.\w+$/, '$1')
+  const value = modulesFiles(modulePath)
+
+  modules[moduleName] = value.default
+
+  return modules
+}, {})
+
+const store = new Vuex.Store({
+    modules,
+    getters: {
+        list: state => state.test.list
+    }
+})
+  
+export default store;
\ No newline at end of file
diff --git a/src/store/modules/test.js b/src/store/modules/test.js
new file mode 100644
index 0000000..8bedb5d
--- /dev/null
+++ b/src/store/modules/test.js
@@ -0,0 +1,41 @@
+const state = {
+  list: [],
+};
+
+const mutations = {
+  INIT: (state, list) => {
+    state.list = list;
+  },
+};
+
+const actions = {
+  fetch({ commit }, param) {
+    uni
+      .request({
+        url: "https://api.glass.xiuyetang.com/app/prod/list",
+        method: "post",
+        data: {},
+        header: {
+          "Content-Type": "application/x-www-form-urlencoded",
+        },
+        timeout: 3000,
+        withCredentials: false, 
+        success: (res) => {
+          commit('INIT', res.data.data)
+        },
+        fail: (res) => {
+          console.log("fail status === > ", res);
+        },
+        complete: (res) => {
+          console.log("complete status === > ", res);
+        },
+      });
+  },
+};
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions,
+};
-- 
2.0.0