Merge branch 'test' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa

season
2 parents ed8ea782 42c7b44d
Showing 1 changed file with 9 additions and 2 deletions
app.js
@@ -312,8 +312,8 @@ App({
     },
-      //获取订阅消息模板id
-  async get_template_id(id){
+    //获取订阅消息模板id
+    async get_template_id(id){
     if (!id) { return ''}
     let os = this.globalData.setting;
     let res = await this.promiseGet("/api/wx/weappSendlist/page", {
@@ -1771,6 +1771,13 @@ App({
         }
     },
+    customer_chat(goods_id,type){
+        var url = "/packageG/pages/customer_chat/customer_chat?goods_id="+goods_id;
+        if(type)
+            url += "&type=1";
+        this.goto(url);
+    }
+