add

miaomiao/www/js/config/config.js

@@ -1,13 +1,8 @@
 (function (app) {
     //全局配置 
     app.constant("config", {
-<<<<<<< HEAD
-          //server: 'http://q8.9026.com/',
-          //imgServer: 'http://q8.9026.com/attachment/'
-=======
-          // server: 'http://q8.9026.com/',
-          // imgServer: 'http://q8.9026.com/attachment/'
->>>>>>> d684ce7718047987c6835496179130b948b131a5
+        //server: 'http://q8.9026.com/',
+        //imgServer: 'http://q8.9026.com/attachment/'
         //server: 'http://localhost:8092/',
         //imgServer: 'http://localhost:8092/attachment/'
 

miaomiao/www/js/controllers/home.js

@@ -347,7 +347,7 @@
                             thumb: "q8.9026.com/base/img/share/icon_cat_h.png",
                             media: {
                                 type: Wechat.Type.WEBPAGE,
-                                webpageUrl: "q8.9026.com//admin/share/view?id=" + id
+                                webpageUrl: "config.server//admin/share/view?id=" + id
                             }
                         },
                         scene: Wechat.Scene.SESSION