'cccc'

王东升 · 王东升 · commit 137d8a75df87 · 2018-03-15T03:08:15.000+08:00
diff --git a/src/components/add-comment/add-comment.ts b/src/components/add-comment/add-comment.ts
@@ -44,7 +44,6 @@ export class AddCommentComponent implements OnChanges{
     // 订阅添加评论输入框显示状态
     public subComment() {
         this.TongXin.obComment.subscribe(res => {
-            console.log(res)
             this.showStatus = res.showStatus;
             this.commentInfo.zid = res.commentData.id;
             this.commentData = res.commentData;
@@ -89,7 +88,6 @@ export class AddCommentComponent implements OnChanges{
     }
     // 发送圈子评论
     public sendComment(){
-        console.log(this.commentInfo)
         this.Publish.sendComment(this.commentInfo).subscribe(res=>{
             if(res === "toLogin"){
                 this.navCtrl.push("LoginPage");
diff --git a/src/pages/address-add/address-add.ts b/src/pages/address-add/address-add.ts
@@ -40,7 +40,6 @@ export class AddressAddPage{
   ionViewDidLoad() {
       // 获取省市区城市列表数据
       this.User.cityListData(this.cityList);
-      console.log('ionViewDidLoad AddressAddPage');
 
   }
 
diff --git a/src/pages/address-edit/address-edit.ts b/src/pages/address-edit/address-edit.ts
@@ -41,14 +41,12 @@ export class AddressEditPage {
         public Goods:GoodsProvider,
         public Pop:PopProvider
     ) {
-        console.log(this.userInfo)
         this.addressId = this.navParams.get("id");
     }
 
     ionViewDidLoad() {
         // 获取省市区城市列表数据
         this.User.cityListData(this.cityList);
-        console.log('ionViewDidLoad AddressAddPage');
         this.getAddressInfo();
     }
     // 获取地址详情
diff --git a/src/pages/address-list/address-list.ts b/src/pages/address-list/address-list.ts
@@ -27,18 +27,12 @@ export class AddressListPage {
   }
 
   ionViewDidLoad() {
-    console.log('ionViewDidLoad AddressListPage');
-
   }
     ionViewDidEnter(){
         this.addressListData();
     }
   // 获取地址列表数据
   public addressListData(){
-    // this.http.get("./assets/data.json").subscribe(data=>{
-    //   this.addressList = data['addressList'];
-    //   console.log(data['addressList'])
-    // });
       this.Goods.addressList().subscribe(res =>{
           if(res === "toLogin"){
               this.navCtrl.push("LoginPage");
diff --git a/src/pages/cart/cart.ts b/src/pages/cart/cart.ts
@@ -32,20 +32,17 @@ export class CartPage {
     }
 
     ionViewDidLoad() {
-        console.log('ionViewDidLoad CartPage');
         this.getCartList();
     }
 
     // 购物车列表数据
     public getCartList(){
-        console.log(1111)
         this.User.getCartData().subscribe(res =>{
             if(res === "toLogin"){
                 this.navCtrl.push("LoginPage");
                 return false;
             }
             this.Pop.toast(res.message);
-            console.log(res.data)
             res.data.forEach((shop,index,arr) => {
                 shop.kaiguan = true;
                 shop.status = false;
diff --git a/src/pages/circle/circle.ts b/src/pages/circle/circle.ts
@@ -31,24 +31,17 @@ export class CirclePage {
     }
 
     ionViewDidLoad() {
-        console.log('ionViewDidLoad CirclePage');
         this.getData();
     }
     ionViewWillLeave(){
         this.Utils.toggleTabs(false);
     }
     // 获取圈子页面数据
-    // public getCircleData() {
-    //     this.http.get("./assets/data.json").subscribe(data => {
-    //         this.circle = data['circle'];
-    //     });
-    // }
     public getData(type = 0,page = 1){
         this.storage.get('token').then((token)=>{
             this.Find.getCircleList(type,page,token).subscribe(res=>{
                 if(res.code == 0){
                     this.circleData = res.data.list;
-                    console.log(this.circleData)
                     return true;
                 }
                 this.pop.toast(res.message);
diff --git a/src/pages/comment/comment.ts b/src/pages/comment/comment.ts
@@ -55,7 +55,7 @@ export class CommentPage {
   }
 
   ionViewDidLoad() {
-    console.log('ionViewDidLoad CommentPage');
+
   }
 //选择上传的图片
     public uploadPics() {
diff --git a/src/pages/good/good.ts b/src/pages/good/good.ts
@@ -29,13 +29,12 @@ export class GoodPage {
     }
 
     ionViewDidLoad() {
-        console.log('ionViewDidLoad GoodPage');
+
     }
 
     // 请求商品详情页数据
     public goodsData() {
         let id = this.navParams.get("id");
-        console.log(id)
         this.Goods.getGoodDetail(id).subscribe(res => {
             if(res.code == 0){
                 res.data.num = 1;
diff --git a/src/pages/live-config/live-config.ts b/src/pages/live-config/live-config.ts
@@ -47,7 +47,7 @@ export class LiveConfigPage {
   }
 
   ionViewDidLoad() {
-    console.log('ionViewDidLoad LiveConfigPage');
+
   }
 
   //跳转到设置教程
diff --git a/src/providers/find.ts b/src/providers/find.ts
@@ -16,8 +16,7 @@ export class FindProvider {
   }
     //获取我的圈子列表
     public getCircleList(type = 0, page = 1, token = '') {
-        return this.Http.post({
-            op: 'get_circle_list',
+        return this.Http.post('circle',{
             type: type,
             page: page,
             token: token
@@ -26,9 +25,8 @@ export class FindProvider {
     // 获取缘分列表
     public getLuckList(params){
       let options = {
-          op:"luck",
           page:params.page
       };
-      return this.Http.post(options);
+      return this.Http.post('luck',options);
     }
 }
diff --git a/src/providers/goods.ts b/src/providers/goods.ts
@@ -20,27 +20,23 @@ export class GoodsProvider {
   // 获取商品详情
   public getGoodDetail(id){
     let options = {
-      op:"get_goods_detail",
         id:id
     };
-    return this.Http.post(options);
+    return this.Http.post('goods/detail',options);
   }
   // 获取更多商品列表
     public moreGoods(params){
         let options = {
-            op:"get_goods_detail",
             id:params.catId,
             page:params.page
         };
-        return this.Http.post(options);
+        return this.Http.post('goods/detail',options);
     }
     // 购买商品
     public goodsBuy(params,type = ""){
         let options = {};
-        console.log(type)
         if(type == ''){
             options = {
-                op:"check_order",
                 goods_id :params.id,
                 sku_key :params.sku_key,
                 sku_desc  :params.sku_desc,
@@ -49,98 +45,85 @@ export class GoodsProvider {
             };
         }else{
             options = {
-                op:"check_order",
                 id :params.ids,
                 // ids :params.ids
             };
         }
-        console.log(params)
-        return this.Auth.authLogin(options);
+        return this.Auth.authLogin(options,'order/check');
     }
     // 添加至购物车
     public goodsAddCart(params){
         let options = {
-            op:"add_cart",
             goods_id :params.id,
             sku_key :params.sku_key,
             sku_desc  :params.sku_desc,
             buy_num :params.num,
             address_id:params.address_id
         };
-        return this.Auth.authLogin(options);
+        return this.Auth.authLogin(options,'cart/add');
     }
     // 删除购物车商品
     public delCartGoods(id){
         let options = {
-            op:"delete_cart",
             id:id
         };
-        return this.Auth.authLogin(options);
+        return this.Auth.authLogin(options,'cart/delete');
     }
     // 修改购物车商品数量
     public editCartGoods(params){
         let options = {
-            op:"update_cart",
             cart_id:params.cartId,
             buy_num:params.buyNum
         };
-        return this.Auth.authLogin(options);
+        return this.Auth.authLogin(options,'cart/update');
     }
     // 获取用户地址列表
     public addressList(){
-        let options = {
-            op:"get_address",
-        };
-        return this.Auth.authLogin(options);
+        return this.Auth.authLogin({},'address');
     }
     // 添加新地址
     public addNewAddress(params){
         let options = {
-            op:"add_address",
             realname:params.name,
             mobile:params.mobile,
             province:params.province,
             city:params.city,
             district:params.district,
             address:params.area
         };
-        return this.Auth.authLogin(options);
+        return this.Auth.authLogin(options,'address/add');
     }
     // 获取当前地址详情
     public getAddressInfo(id){
         let options = {
-            op:"address_detail",
             id:id
         };
-        return this.Auth.authLogin(options);
+        return this.Auth.authLogin(options,'address/detail');
     }
     // 编辑保存当前地址
     public editSaveAddress(params){
         let options = {
-            op:"update_address",
             realname:params.name,
             mobile:params.mobile,
             province:params.province,
             city:params.city,
             district:params.district,
             address:params.area
         };
-        return this.Auth.authLogin(options);
+        return this.Auth.authLogin(options,'address/update');
     }
     // 删除当前收货地址
     public delAddress(id){
         let options = {
-            op:"delete_address",
             id:id
         };
-        return this.Auth.authLogin(options);
+        return this.Auth.authLogin(options,'address/delete');
     }
     // 设为默认地址
     public defaultAddress(id){
         let options = {
-            op:"set_default_address",
             id:id
         };
-        return this.Auth.authLogin(options);
+        return this.Auth.authLogin(options,'address/set_default');
     }
 }
diff --git a/src/providers/order.ts b/src/providers/order.ts
@@ -47,46 +47,41 @@ export class OrderProvider {
     // 获取已下单订单的详情信息
     public getOrderInfo(id){
         let options = {
-            op:"pay",
             id:id
         };
-        return this.Auth.authLogin(options);
+        return this.Auth.authLogin(options,'pay');
     }
     // 支付宝、微信、余额付款
     public payMoney(params,pwd = 0){
         let options = {};
         if(pwd === 0){
             options = {
-                op:"push_pay",
                 id:params.id,
                 pay_method:params.payMethod
             };
         }else{
             options = {
-                op:"push_pay",
                 id:params.id,
                 pay_method:params.payMethod,
                 password:pwd
             };
         }
 
-        return this.Auth.authLogin(options);
+        return this.Auth.authLogin(options,'pay/push');
     }
     // 已下单订单信息页数据
     public orderInfo(id){
         let options = {
-            op:"get_orders",
             id:id
         };
-        return this.Auth.authLogin(options);
+        return this.Auth.authLogin(options,'order');
     }
     // 获取所有订单状态列表
     public orderList(params){
         let options = {
-            op:"get_orders",
             status:params.status,
             page:params.page
         };
-        return this.Auth.authLogin(options);
+        return this.Auth.authLogin(options,'order');
     }
 }
diff --git a/src/providers/publish.ts b/src/providers/publish.ts
@@ -24,38 +24,34 @@ export class PublishProvider {
     public pubCircle(params) {
 
         let options = {
-            op: "push_circle",
             content:params.content,
             src: params.src
         };
-        return this.Auth.authLogin(options);
+        return this.Auth.authLogin(options,'circle/push');
     }
     // 点赞功能
     public dianZan(zid){
         let options = {
-            op:"push_circle_like",
             circle_id:zid
         };
-        return this.Auth.authLogin(options);
+        return this.Auth.authLogin(options,'circle/push_like');
     }
     // 发送圈子评论
     public sendComment(params){
         let options = {
-            op:"push_circle_talk",
             circle_id:params.zid,
             content:params.content,
             thumb:params.thumb
         };
-        return this.Auth.authLogin(options);
+        return this.Auth.authLogin(options,'circle/push_talk');
     }
     // 头条、新闻、客服页面添加评论
     public addComment(params){
         let options = {
-            op:params.op,
             id:params.id,
             content:params.content,
             src:params.src
         };
-        return this.Auth.authLogin(options);
+        return this.Auth.authLogin(options,'circle/'+params.op);
     }
 }
diff --git a/src/providers/tabs.ts b/src/providers/tabs.ts
diff --git a/src/providers/user.ts b/src/providers/user.ts

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ export class AddressAddPage{`
`40`	`40`	`ionViewDidLoad() {`
`41`	`41`	`// 获取省市区城市列表数据`
`42`	`42`	`this.User.cityListData(this.cityList);`
`43`		`- console.log('ionViewDidLoad AddressAddPage');`
`44`	`43`
`45`	`44`	`}`
`46`	`45`
Original file line number	Diff line number	Diff line change
`@@ -41,14 +41,12 @@ export class AddressEditPage {`
`41`	`41`	`public Goods:GoodsProvider,`
`42`	`42`	`public Pop:PopProvider`
`43`	`43`	`) {`
`44`		`- console.log(this.userInfo)`
`45`	`44`	`this.addressId = this.navParams.get("id");`
`46`	`45`	`}`
`47`	`46`
`48`	`47`	`ionViewDidLoad() {`
`49`	`48`	`// 获取省市区城市列表数据`
`50`	`49`	`this.User.cityListData(this.cityList);`
`51`		`- console.log('ionViewDidLoad AddressAddPage');`
`52`	`50`	`this.getAddressInfo();`
`53`	`51`	`}`
`54`	`52`	`// 获取地址详情`
Original file line number	Diff line number	Diff line change
`@@ -27,18 +27,12 @@ export class AddressListPage {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`ionViewDidLoad() {`
`30`		`- console.log('ionViewDidLoad AddressListPage');`
`31`		`-`
`32`	`30`	`}`
`33`	`31`	`ionViewDidEnter(){`
`34`	`32`	`this.addressListData();`
`35`	`33`	`}`
`36`	`34`	`// 获取地址列表数据`
`37`	`35`	`public addressListData(){`
`38`		`- // this.http.get("./assets/data.json").subscribe(data=>{`
`39`		`- // this.addressList = data['addressList'];`
`40`		`- // console.log(data['addressList'])`
`41`		`- // });`
`42`	`36`	`this.Goods.addressList().subscribe(res =>{`
`43`	`37`	`if(res === "toLogin"){`
`44`	`38`	`this.navCtrl.push("LoginPage");`
Original file line number	Diff line number	Diff line change
`@@ -32,20 +32,17 @@ export class CartPage {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`ionViewDidLoad() {`
`35`		`- console.log('ionViewDidLoad CartPage');`
`36`	`35`	`this.getCartList();`
`37`	`36`	`}`
`38`	`37`
`39`	`38`	`// 购物车列表数据`
`40`	`39`	`public getCartList(){`
`41`		`- console.log(1111)`
`42`	`40`	`this.User.getCartData().subscribe(res =>{`
`43`	`41`	`if(res === "toLogin"){`
`44`	`42`	`this.navCtrl.push("LoginPage");`
`45`	`43`	`return false;`
`46`	`44`	`}`
`47`	`45`	`this.Pop.toast(res.message);`
`48`		`- console.log(res.data)`
`49`	`46`	`res.data.forEach((shop,index,arr) => {`
`50`	`47`	`shop.kaiguan = true;`
`51`	`48`	`shop.status = false;`
Original file line number	Diff line number	Diff line change
`@@ -31,24 +31,17 @@ export class CirclePage {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`ionViewDidLoad() {`
`34`		`- console.log('ionViewDidLoad CirclePage');`
`35`	`34`	`this.getData();`
`36`	`35`	`}`
`37`	`36`	`ionViewWillLeave(){`
`38`	`37`	`this.Utils.toggleTabs(false);`
`39`	`38`	`}`
`40`	`39`	`// 获取圈子页面数据`
`41`		`- // public getCircleData() {`
`42`		`- // this.http.get("./assets/data.json").subscribe(data => {`
`43`		`- // this.circle = data['circle'];`
`44`		`- // });`
`45`		`- // }`
`46`	`40`	`public getData(type = 0,page = 1){`
`47`	`41`	`this.storage.get('token').then((token)=>{`
`48`	`42`	`this.Find.getCircleList(type,page,token).subscribe(res=>{`
`49`	`43`	`if(res.code == 0){`
`50`	`44`	`this.circleData = res.data.list;`
`51`		`- console.log(this.circleData)`
`52`	`45`	`return true;`
`53`	`46`	`}`
`54`	`47`	`this.pop.toast(res.message);`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ export class CommentPage {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`ionViewDidLoad() {`
`58`		`- console.log('ionViewDidLoad CommentPage');`
	`58`	`+`
`59`	`59`	`}`
`60`	`60`	`//选择上传的图片`
`61`	`61`	`public uploadPics() {`
Original file line number	Diff line number	Diff line change
`@@ -29,13 +29,12 @@ export class GoodPage {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`ionViewDidLoad() {`
`32`		`- console.log('ionViewDidLoad GoodPage');`
	`32`	`+`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`// 请求商品详情页数据`
`36`	`36`	`public goodsData() {`
`37`	`37`	`let id = this.navParams.get("id");`
`38`		`- console.log(id)`
`39`	`38`	`this.Goods.getGoodDetail(id).subscribe(res => {`
`40`	`39`	`if(res.code == 0){`
`41`	`40`	`res.data.num = 1;`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ export class LiveConfigPage {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`ionViewDidLoad() {`
`50`		`- console.log('ionViewDidLoad LiveConfigPage');`
	`50`	`+`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`//跳转到设置教程`