diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..824f3ae
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+cultural
\ No newline at end of file
diff --git a/app/bailang/release/output-metadata.json b/app/bailang/release/output-metadata.json
deleted file mode 100644
index 5383d66..0000000
--- a/app/bailang/release/output-metadata.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "version": 3,
-  "artifactType": {
-    "type": "APK",
-    "kind": "Directory"
-  },
-  "applicationId": "com.tenlion.cultural.bailang",
-  "variantName": "bailangRelease",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "attributes": [],
-      "versionCode": 12,
-      "versionName": "1.1.2",
-      "outputFile": "bailang-v1.1.2-12.apk"
-    }
-  ],
-  "elementType": "File"
-}
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 3240b45..7097d09 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,19 +3,20 @@ apply plugin: 'com.android.application'
 android {
     signingConfigs {
         release {
-            storeFile file('/Users/adam/Documents/work/tengshi.jks')
+            storeFile file('/Users/adam/Documents/work/keystore/tengshi.jks')
             storePassword 'aaa111!!!'
             keyAlias = 'tengshi'
             keyPassword 'aaa111!!!'
         }
         debug {
-            storeFile file('/Users/adam/Documents/work/tengshi.jks')
+            storeFile file('/Users/adam/Documents/work/keystore/tengshi.jks')
             storePassword 'aaa111!!!'
             keyAlias = 'tengshi'
             keyPassword 'aaa111!!!'
         }
     }
     compileSdkVersion rootProject.ext.gCompileSdkVersion
+    buildToolsVersion rootProject.ext.gBuildToolsVersion
     defaultConfig {
         applicationId "com.tengshisoft.cultural"
         minSdkVersion rootProject.ext.gMinSdkVersion
@@ -34,136 +35,19 @@ android {
                 JPUSH_CHANNEL : "developer-default", //暂时填写默认值即可.
                 TENCENT_APPID : "101880285",//腾讯开放平台注册应用得到的appId
         ]
-        flavorDimensions("market")
     }
 
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            android.applicationVariants.all {
-                variant ->
-                    variant.outputs.all {
-                        outputFileName = "${variant.productFlavors[0].name}" + "-v" + defaultConfig.versionName + "-c" + defaultConfig.versionCode + ".apk"
-                    }
-            }
         }
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    productFlavors {
-        sangzhuzi {
-            applicationId "com.tenlion.cultural.sangzhuzi"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "sangzhuzi"
-            manifestPlaceholders = [CHANNEL_VALUE: "sangzhuzi", CITY_CODE: "640676"]
-        }
-        nanmulin {
-            applicationId "com.tenlion.cultural.nanmulin"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "nanmulin"
-            manifestPlaceholders = [CHANNEL_VALUE: "nanmulin", CITY_CODE: "640865"]
-        }
-        jiangzi {
-            applicationId "com.tenlion.cultural.jiangzi"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "jiangzi"
-            manifestPlaceholders = [CHANNEL_VALUE: "jiangzi", CITY_CODE: "641029"]
-        }
-        dingri {
-            applicationId "com.tenlion.cultural.dingri"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "dingri"
-            manifestPlaceholders = [CHANNEL_VALUE: "dingri", CITY_CODE: "641204"]
-        }
-        sajia {
-            applicationId "com.tenlion.cultural.sajia"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "sajia"
-            manifestPlaceholders = [CHANNEL_VALUE: "sajia", CITY_CODE: "641393"]
-        }
-        lazi {
-            applicationId "com.tenlion.cultural.lazi"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "lazi"
-            manifestPlaceholders = [CHANNEL_VALUE: "lazi", CITY_CODE: "641512"]
-        }
-        angren {
-            applicationId "com.tenlion.cultural.angren"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "angren"
-            manifestPlaceholders = [CHANNEL_VALUE: "angren", CITY_CODE: "641622"]
-        }
-        xietongmen {
-            applicationId "com.tenlion.cultural.xietongmen"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "xietongmen"
-            manifestPlaceholders = [CHANNEL_VALUE: "xietongmen", CITY_CODE: "641825"]
-        }
-        bailang {
-            applicationId "com.tenlion.cultural.bailang"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "bailang"
-            manifestPlaceholders = [CHANNEL_VALUE: "bailang", CITY_CODE: "641940"]
-        }
-        renbu {
-            applicationId "com.tenlion.cultural.renbu"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "renbu"
-            manifestPlaceholders = [CHANNEL_VALUE: "renbu", CITY_CODE: "642063"]
-        }
-        kangma {
-            applicationId "com.tenlion.cultural.kangma"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "kangma"
-            manifestPlaceholders = [CHANNEL_VALUE: "kangma", CITY_CODE: "642146"]
-        }
-        dingjie {
-            applicationId "com.tenlion.cultural.dingjie"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "dingjie"
-            manifestPlaceholders = [CHANNEL_VALUE: "dingjie", CITY_CODE: "642203"]
-        }
-        zhongba {
-            applicationId "com.tenlion.cultural.zhongba"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "zhongba"
-            manifestPlaceholders = [CHANNEL_VALUE: "zhongba", CITY_CODE: "642284"]
-        }
-        yadong {
-            applicationId "com.tenlion.cultural.yadong"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "yadong"
-            manifestPlaceholders = [CHANNEL_VALUE: "yadong", CITY_CODE: "642356"]
-        }
-        jilong {
-            applicationId "com.tenlion.cultural.jilong"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "jilong"
-            manifestPlaceholders = [CHANNEL_VALUE: "jilong", CITY_CODE: "642389"]
-        }
-        nielamu {
-            applicationId "com.tenlion.cultural.nielamu"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "nielamu"
-            manifestPlaceholders = [CHANNEL_VALUE: "nielamu", CITY_CODE: "642437"]
-        }
-        saga {
-            applicationId "com.tenlion.cultural.saga"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "saga"
-            manifestPlaceholders = [CHANNEL_VALUE: "saga", CITY_CODE: "642489"]
-        }
-        gangba {
-            applicationId "com.tenlion.cultural.gangba"
-            dimension 'market'
-            resValue "string", "APP_CHANNEL", "gangba"
-            manifestPlaceholders = [CHANNEL_VALUE: "gangba", CITY_CODE: "642536"]
-        }
-    }
-    buildToolsVersion '30.0.2'
+
 }
 
 dependencies {
@@ -183,6 +67,7 @@ dependencies {
         implementation project(':moduleplace')//场馆
         implementation project(':modulemine')//我的
         implementation project(':modulemap')//地图
+        implementation project(':moduleshop')//地图
     }
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'com.github.jarryleo:MagicScreenAdapter:v2.1'
diff --git a/app/jangzi/release/output-metadata.json b/app/jangzi/release/output-metadata.json
deleted file mode 100644
index c88ed35..0000000
--- a/app/jangzi/release/output-metadata.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "version": 3,
-  "artifactType": {
-    "type": "APK",
-    "kind": "Directory"
-  },
-  "applicationId": "com.tenlion.cultural.jangzi",
-  "variantName": "jangziRelease",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "attributes": [],
-      "versionCode": 12,
-      "versionName": "1.1.2",
-      "outputFile": "myApk-v1.1.2-12.apk"
-    }
-  ],
-  "elementType": "File"
-}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2394036..ec7be10 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,12 +15,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true">
-        <meta-data
-            android:name="CHANNEL_VALUE"
-            android:value="${CHANNEL_VALUE}" />
-        <meta-data
-            android:name="CITY_CODE"
-            android:value="${CITY_CODE}" />
+
 
 
         <activity
diff --git a/modulemain/build.gradle b/modulemain/build.gradle
index eef19a5..e00f6e1 100755
--- a/modulemain/build.gradle
+++ b/modulemain/build.gradle
@@ -40,6 +40,7 @@ dependencies {
     implementation project(':moduleplace')
     implementation project(':moduleactivity')
     implementation project(':modulecultural')
+    implementation project(':moduleshop')
     implementation files('libs/BaiduLBS_Android.jar')
     implementation 'androidx.appcompat:appcompat:1.1.0'
     testImplementation 'junit:junit:4.12'
diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/SplashActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/SplashActivity.java
index 3821686..c0b4a93 100755
--- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/SplashActivity.java
+++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/SplashActivity.java
@@ -1,7 +1,5 @@
 package com.tengshisoft.mudulemain.cultural.activitys.base;
 
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
 import android.view.View;
 
 import com.alibaba.android.arouter.launcher.ARouter;
@@ -9,7 +7,6 @@ import com.gyf.immersionbar.ImmersionBar;
 import com.sucstepsoft.cm_utils.constant.PathConfig;
 import com.sucstepsoft.cm_utils.constant.PermissionConstants;
 import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
-import com.sucstepsoft.cm_utils.utils.LogUtils;
 import com.sucstepsoft.cm_utils.utils.PermissionUtils;
 import com.sucstepsoft.cm_utils.utils.toast.ToastUtils;
 import com.tengshisoft.mudulemain.R;
@@ -84,20 +81,6 @@ public class SplashActivity extends BaseActivity {
                 }).request();
 
     }
-    /**
-     * 获取城市代码
-     */
-    private void getCityCode() {
-        String cityCode = "";
-        try {
-            ApplicationInfo info = getPackageManager().getApplicationInfo(getPackageName(),
-                    PackageManager.GET_META_DATA);
-            cityCode = String.valueOf(info.metaData.get("CITY_CODE"));
-            LogUtils.e("设置的城市代码====" + cityCode);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
 
     @Override
     protected void onDestroy() {
diff --git a/moduleshop/.gitignore b/moduleshop/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/moduleshop/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/moduleshop/build.gradle b/moduleshop/build.gradle
new file mode 100644
index 0000000..37f619d
--- /dev/null
+++ b/moduleshop/build.gradle
@@ -0,0 +1,90 @@
+if (!IsModuleDev.toBoolean()) {
+    apply plugin: 'com.android.application'
+} else {
+    apply plugin: 'com.android.library'
+}
+apply plugin: 'com.jakewharton.butterknife'
+apply plugin: 'android-aspectjx'
+android {
+    buildToolsVersion rootProject.ext.gBuildToolsVersion
+    compileSdkVersion rootProject.ext.gCompileSdkVersion
+    defaultConfig {
+        minSdkVersion rootProject.ext.gMinSdkVersion
+        targetSdkVersion rootProject.ext.gCompileSdkVersion
+        versionCode rootProject.ext.gVersionCode
+        versionName rootProject.ext.gVersionName
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [AROUTER_MODULE_NAME: project.getName()]
+            }
+        }
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(':cm_utils')
+//    implementation files('libs/tbs.jar')
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    annotationProcessor "com.alibaba:arouter-compiler:${rootProject.ext.gRouterCompileVersion}"
+    //SmartRefreshLayout
+    implementation "com.scwang.smartrefresh:SmartRefreshLayout:${rootProject.ext.gSmartRefreshLayoutVersion}"
+    //Rxjava
+    implementation "io.reactivex.rxjava2:rxjava:${rootProject.ext.gRxJavaVersion}"
+    implementation "io.reactivex.rxjava2:rxandroid:${rootProject.ext.gRxAndroid}"
+    //RxJava
+    implementation "com.squareup.retrofit2:retrofit:${rootProject.ext.gRetrofitVersion}"
+    //Gson
+    implementation "com.google.code.gson:gson:${rootProject.ext.gGsonVersion}"
+    //butterknife
+    annotationProcessor "com.jakewharton:butterknife-compiler:${rootProject.ext.gButterKnifeVersion}"
+    //选择器
+    implementation "com.contrarywind:Android-PickerView:${rootProject.ext.pickerViewVersion}"
+    //gson
+    implementation "com.google.code.gson:gson:${rootProject.ext.supportGson}"
+    //glide
+    implementation "com.github.bumptech.glide:glide:${rootProject.ext.supportGlide}"
+    annotationProcessor "com.github.bumptech.glide:compiler:${rootProject.ext.supportGlide}"
+    //加载更多
+    implementation "com.jcodecraeer:xrecyclerview:${rootProject.ext.xRecyclerViewVersion}"
+    implementation "com.leon:lfilepickerlibrary:${rootProject.ext.lfilepickerlibraryVersion}"
+    //指示器
+    implementation "com.github.hackware1993:MagicIndicator:${rootProject.ext.mIndicatorVersion}"
+    implementation 'com.github.razerdp:BasePopup:2.2.1'
+    //图片压缩
+    implementation "top.zibin:Luban:$rootProject.ext.lubanVersio"
+    //banner
+    implementation "com.youth.banner:banner:${rootProject.ext.bannerVersion}"
+    //星星评价
+    implementation 'me.zhanghai.android.materialratingbar:library:1.4.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    //骨架
+    implementation 'com.ethanhua:skeleton:1.1.2'
+    implementation 'io.supercharge:shimmerlayout:2.1.0'
+    //屏幕适配
+    implementation 'com.github.jarryleo:MagicScreenAdapter:v2.1'
+    // 基础依赖包，必须要依赖
+    implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+// fragment快速实现（可选）
+    implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
+}
diff --git a/moduleshop/consumer-rules.pro b/moduleshop/consumer-rules.pro
new file mode 100644
index 0000000..e69de29
diff --git a/moduleshop/proguard-rules.pro b/moduleshop/proguard-rules.pro
new file mode 100644
index 0000000..481bb43
--- /dev/null
+++ b/moduleshop/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/moduleshop/src/androidTest/java/com/tenlionsoft/moduleshop/ExampleInstrumentedTest.java b/moduleshop/src/androidTest/java/com/tenlionsoft/moduleshop/ExampleInstrumentedTest.java
new file mode 100644
index 0000000..880408a
--- /dev/null
+++ b/moduleshop/src/androidTest/java/com/tenlionsoft/moduleshop/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package com.tenlionsoft.moduleshop;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        assertEquals("com.tenlionsoft.moduleshop.test", appContext.getPackageName());
+    }
+}
\ No newline at end of file
diff --git a/moduleshop/src/main/AndroidManifest.xml b/moduleshop/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..7a8a340
--- /dev/null
+++ b/moduleshop/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.tengshisoft.moduleshop">
+
+</manifest>
\ No newline at end of file
diff --git a/moduleshop/src/test/java/com/tenlionsoft/moduleshop/ExampleUnitTest.java b/moduleshop/src/test/java/com/tenlionsoft/moduleshop/ExampleUnitTest.java
new file mode 100644
index 0000000..279e94c
--- /dev/null
+++ b/moduleshop/src/test/java/com/tenlionsoft/moduleshop/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package com.tenlionsoft.moduleshop;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index cec9ae5..532c43a 100755
--- a/settings.gradle
+++ b/settings.gradle
@@ -7,3 +7,4 @@ include ':modulecultural'
 include ':modulemine'
 include ':moduleijkplayer'
 include ':modulemap'
+include ':moduleshop'